Commit a34fe8161ff7b79bdd90633b2389a3993b899812
2021-10-21T12:28:35
Added the ability to bind NV12 textures in the OpenGL renderer
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 23a905d..80cfd09 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -1675,15 +1675,28 @@ GL_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, floa
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);
+ }
+ }
#endif
data->glBindTexture(textype, texturedata->texture);
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;