Make shaderExecutable::getConstantTable virtual

Trac #22155 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens Should be temporary until we figure out what we're doing in ProgramBinary for d3d11 shaders git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1509 736b8ea6-26fd-11df-bfd4-992fa37f6226

Make shaderExecutable::getConstantTable virtual
4f6024ad · daniel@transgaming.com · c0ccbd83 · 4f6024ad · 4f6024ad
Commit 4f6024ad authored Nov 28, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ShaderExecutable.h src/libGLESv2/renderer/ShaderExecutable.h +3 -0

ShaderExecutable9.h src/libGLESv2/renderer/ShaderExecutable9.h +1 -1

No files found.
--- a/src/libGLESv2/renderer/ShaderExecutable.h
+++ b/src/libGLESv2/renderer/ShaderExecutable.h
@@ -11,6 +11,7 @@
 #define LIBGLESV2_RENDERER_SHADEREXECUTABLE_H_

 #include "common/angleutils.h"
+#include "libGLESv2/D3DConstantTable.h"

 namespace rx
 {
@@ -24,6 +25,8 @@ class ShaderExecutable
    virtual bool getVertexFunction(void *pData, UINT *pSizeOfData) = 0;
    virtual bool getPixelFunction(void *pData, UINT *pSizeOfData) = 0;

+    virtual gl::D3DConstantTable *getConstantTable() = 0; // D3D9_REMOVE
+
  private:
    DISALLOW_COPY_AND_ASSIGN(ShaderExecutable);
 };

--- a/src/libGLESv2/renderer/ShaderExecutable9.h
+++ b/src/libGLESv2/renderer/ShaderExecutable9.h
@@ -32,7 +32,7 @@ class ShaderExecutable9 : public ShaderExecutable

    IDirect3DPixelShader9 *getPixelShader();
    IDirect3DVertexShader9 *getVertexShader();
-    gl::D3DConstantTable *getConstantTable();
+    virtual gl::D3DConstantTable *getConstantTable();

  private:
    DISALLOW_COPY_AND_ASSIGN(ShaderExecutable9);