wrong usage of glTexEnvi fixed

- the environment must be GL_TEXTURE_ENV and not GL_TEXTURE_2D
- it must be set before a draw function (glBegin(), ...) and not before glTexImage2D() as the current texture will not store this setting (the setting is global for all textures).
- the setting must be set to the default (GL_MODULATE) after usage, otherwise later opengl drawing calls will be unwantedly affected too.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2309 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 5 insertions, 2 deletions

diff --git a/src/media/UVideo.pas b/src/media/UVideo.pas
index 0716bee2..c7d59fc8 100644
--- a/src/media/UVideo.pas
+++ b/src/media/UVideo.pas
@@ -824,8 +824,8 @@ begin
   //   Or should we add padding with avpicture_fill? (check which one is faster)
   //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-  // TODO: check if this is faster
-  //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+  // glTexEnvi with GL_REPLACE might give a small speed improvement
+  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 
   if (not fPboEnabled) then
   begin
@@ -867,6 +867,9 @@ begin
       Log.LogError('PBO texture stream error: ' + gluErrorString(glErr), 'TVideo_FFmpeg.GetFrame');
   end;
 
+  // reset to default
+  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
   if (not fFrameTexValid) then
     fFrameTexValid := true;