|
@@ -1671,6 +1671,16 @@ GL_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, floa
|
|
|
}
|
|
|
data->glBindTexture(textype, texturedata->utexture);
|
|
|
|
|
|
+ if (data->GL_ARB_multitexture_supported) {
|
|
|
+ data->glActiveTextureARB(GL_TEXTURE0_ARB);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (texturedata->nv12) {
|
|
|
+ if (data->GL_ARB_multitexture_supported) {
|
|
|
+ data->glActiveTextureARB(GL_TEXTURE1_ARB);
|
|
|
+ }
|
|
|
+ data->glBindTexture(textype, texturedata->utexture);
|
|
|
+
|
|
|
if (data->GL_ARB_multitexture_supported) {
|
|
|
data->glActiveTextureARB(GL_TEXTURE0_ARB);
|
|
|
}
|
|
@@ -1681,9 +1691,12 @@ GL_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, floa
|
|
|
data->drawstate.texturing = SDL_TRUE;
|
|
|
data->drawstate.texture = texture;
|
|
|
|
|
|
- if(texw) *texw = (float)texturedata->texw;
|
|
|
- if(texh) *texh = (float)texturedata->texh;
|
|
|
-
|
|
|
+ if (texw) {
|
|
|
+ *texw = (float)texturedata->texw;
|
|
|
+ }
|
|
|
+ if (texh) {
|
|
|
+ *texh = (float)texturedata->texh;
|
|
|
+ }
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -1701,19 +1714,32 @@ GL_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture)
|
|
|
if (data->GL_ARB_multitexture_supported) {
|
|
|
data->glActiveTextureARB(GL_TEXTURE2_ARB);
|
|
|
}
|
|
|
+ data->glBindTexture(textype, 0);
|
|
|
data->glDisable(textype);
|
|
|
|
|
|
if (data->GL_ARB_multitexture_supported) {
|
|
|
data->glActiveTextureARB(GL_TEXTURE1_ARB);
|
|
|
}
|
|
|
+ data->glBindTexture(textype, 0);
|
|
|
data->glDisable(textype);
|
|
|
|
|
|
if (data->GL_ARB_multitexture_supported) {
|
|
|
data->glActiveTextureARB(GL_TEXTURE0_ARB);
|
|
|
}
|
|
|
}
|
|
|
-#endif
|
|
|
+ if (texturedata->nv12) {
|
|
|
+ if (data->GL_ARB_multitexture_supported) {
|
|
|
+ data->glActiveTextureARB(GL_TEXTURE1_ARB);
|
|
|
+ }
|
|
|
+ data->glBindTexture(textype, 0);
|
|
|
+ data->glDisable(textype);
|
|
|
|
|
|
+ if (data->GL_ARB_multitexture_supported) {
|
|
|
+ data->glActiveTextureARB(GL_TEXTURE0_ARB);
|
|
|
+ }
|
|
|
+ }
|
|
|
+#endif
|
|
|
+ data->glBindTexture(textype, 0);
|
|
|
data->glDisable(textype);
|
|
|
|
|
|
data->drawstate.texturing = SDL_FALSE;
|