commit 38e76e535b42e33173a126ff82f75cfcdf093270
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon Mar 21 16:39:10 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon Mar 21 16:39:10 2011 +0000
tree f081fa1df9f100490a0119b642ffeac686bb2b81
parent 51887316dcd957d57674e4ee8f225379b84c79e2

Keep track of applied textures and dirty state to minimize D3D calls.

TRAC #15703
Issue=86
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@588 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 70122fb..62ce65f 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -319,11 +319,16 @@
 // This function will set all of the state-related dirty flags, so that all state is set during next pre-draw.
 void Context::markAllStateDirty()
 {
+    for (int t = 0; t < MAX_TEXTURE_IMAGE_UNITS; t++)
+    {
+        mAppliedTexture[t] = 0;
+    }
+
+    mAppliedProgram = 0;
     mAppliedRenderTargetSerial = 0;
     mAppliedDepthbufferSerial = 0;
     mAppliedStencilbufferSerial = 0;
     mDepthStencilInitialized = false;
-    mAppliedProgram = 0;
 
     mClearStateDirty = true;
     mCullStateDirty = true;
@@ -2005,7 +2010,6 @@
     if (programObject->getSerial() != mAppliedProgram)
     {
         programObject->dirtyAllUniforms();
-        programObject->dirtyAllSamplers();
         mAppliedProgram = programObject->getSerial();
     }
 
@@ -2027,9 +2031,11 @@
 
             Texture *texture = getSamplerTexture(textureUnit, textureType);
 
-            if (programObject->isSamplerDirty(sampler) || texture->isDirty())
+            if (mAppliedTexture[sampler] != texture->id() || texture->isDirty())
             {
-                if (texture->isComplete())
+                IDirect3DBaseTexture9 *d3dTexture = texture->getTexture();
+
+                if (d3dTexture)
                 {
                     GLenum wrapS = texture->getWrapS();
                     GLenum wrapT = texture->getWrapT();
@@ -2045,22 +2051,23 @@
                     device->SetSamplerState(sampler, D3DSAMP_MINFILTER, d3dMinFilter);
                     device->SetSamplerState(sampler, D3DSAMP_MIPFILTER, d3dMipFilter);
 
-                    device->SetTexture(sampler, texture->getTexture());
+                    device->SetTexture(sampler, d3dTexture);
                 }
                 else
                 {
                     device->SetTexture(sampler, getIncompleteTexture(textureType)->getTexture());
                 }
-            }
 
-            programObject->setSamplerDirty(sampler, false);
+                mAppliedTexture[sampler] = texture->id();
+                texture->resetDirty();
+            }
         }
         else
         {
-            if (programObject->isSamplerDirty(sampler))
+            if (mAppliedTexture[sampler] != 0)
             {
                 device->SetTexture(sampler, NULL);
-                programObject->setSamplerDirty(sampler, false);
+                mAppliedTexture[sampler] = 0;
             }
         }   
     }