Skip to content

A
angle
Commit 4f6024ad by daniel@transgaming.com
Options

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
parent c0ccbd83
Showing with 4 additions and 1 deletion
src/libGLESv2/renderer/ShaderExecutable.h
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define LIBGLESV2_RENDERER_SHADEREXECUTABLE_H_ #define LIBGLESV2_RENDERER_SHADEREXECUTABLE_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libGLESv2/D3DConstantTable.h"
namespace rx namespace rx
{ {
...@@ -24,6 +25,8 @@ class ShaderExecutable ...@@ -24,6 +25,8 @@ class ShaderExecutable
virtual bool getVertexFunction(void *pData, UINT *pSizeOfData) = 0; virtual bool getVertexFunction(void *pData, UINT *pSizeOfData) = 0;
virtual bool getPixelFunction(void *pData, UINT *pSizeOfData) = 0; virtual bool getPixelFunction(void *pData, UINT *pSizeOfData) = 0;
virtual gl::D3DConstantTable *getConstantTable() = 0; // D3D9_REMOVE
private: private:
DISALLOW_COPY_AND_ASSIGN(ShaderExecutable); DISALLOW_COPY_AND_ASSIGN(ShaderExecutable);
}; };
......
src/libGLESv2/renderer/ShaderExecutable9.h
...@@ -32,7 +32,7 @@ class ShaderExecutable9 : public ShaderExecutable ...@@ -32,7 +32,7 @@ class ShaderExecutable9 : public ShaderExecutable
IDirect3DPixelShader9 *getPixelShader(); IDirect3DPixelShader9 *getPixelShader();
IDirect3DVertexShader9 *getVertexShader(); IDirect3DVertexShader9 *getVertexShader();
gl::D3DConstantTable *getConstantTable(); virtual gl::D3DConstantTable *getConstantTable();
private: private:
DISALLOW_COPY_AND_ASSIGN(ShaderExecutable9); DISALLOW_COPY_AND_ASSIGN(ShaderExecutable9);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment