commit c0ccbd83f41be153d50196243db4ae7dedcccb7c
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:59:37 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:59:37 2012 +0000
tree e5d02a2a8059e98a3cfa8d166ede96b3c54d1bc2
parent 360385473c91f45e83cb63897dfcc7b120a377f7

Add a get*Function method to the ShaderExecutable interface

Trac #22155
Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens

This allows ProgramBinary::save to avoid knowing about D3D9 shaders

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

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index bcff298..04c8e39 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1732,13 +1732,13 @@
     stream.write(mDxPointsOrLinesLocation);
 
     UINT pixelShaderSize;
-    HRESULT result = mPixelExecutable->getPixelShader()->GetFunction(NULL, &pixelShaderSize);
-    ASSERT(SUCCEEDED(result));
+    bool result = mPixelExecutable->getPixelFunction(NULL, &pixelShaderSize);
+    ASSERT(result);
     stream.write(pixelShaderSize);
 
     UINT vertexShaderSize;
-    result = mVertexExecutable->getVertexShader()->GetFunction(NULL, &vertexShaderSize);
-    ASSERT(SUCCEEDED(result));
+    result = mVertexExecutable->getVertexFunction(NULL, &vertexShaderSize);
+    ASSERT(result);
     stream.write(vertexShaderSize);
 
     GUID identifier = mRenderer->getAdapterIdentifier();
@@ -1767,12 +1767,12 @@
         memcpy(ptr, &identifier, sizeof(GUID));
         ptr += sizeof(GUID);
 
-        result = mPixelExecutable->getPixelShader()->GetFunction(ptr, &pixelShaderSize);
-        ASSERT(SUCCEEDED(result));
+        result = mPixelExecutable->getPixelFunction(ptr, &pixelShaderSize);
+        ASSERT(result);
         ptr += pixelShaderSize;
 
-        result = mVertexExecutable->getVertexShader()->GetFunction(ptr, &vertexShaderSize);
-        ASSERT(SUCCEEDED(result));
+        result = mVertexExecutable->getVertexFunction(ptr, &vertexShaderSize);
+        ASSERT(result);
         ptr += vertexShaderSize;
 
         ASSERT(ptr - totalLength == binary);

src/libGLESv2/renderer/ShaderExecutable.h

diff --git a/src/libGLESv2/renderer/ShaderExecutable.h b/src/libGLESv2/renderer/ShaderExecutable.h
index d43f378..7130b77 100644
--- a/src/libGLESv2/renderer/ShaderExecutable.h
+++ b/src/libGLESv2/renderer/ShaderExecutable.h
@@ -21,6 +21,9 @@
     ShaderExecutable() {};
     virtual ~ShaderExecutable() {};
 
+    virtual bool getVertexFunction(void *pData, UINT *pSizeOfData) = 0;
+    virtual bool getPixelFunction(void *pData, UINT *pSizeOfData) = 0;
+
   private:
     DISALLOW_COPY_AND_ASSIGN(ShaderExecutable);
 };

src/libGLESv2/renderer/ShaderExecutable9.cpp

diff --git a/src/libGLESv2/renderer/ShaderExecutable9.cpp b/src/libGLESv2/renderer/ShaderExecutable9.cpp
index 0a19af1..e81a652 100644
--- a/src/libGLESv2/renderer/ShaderExecutable9.cpp
+++ b/src/libGLESv2/renderer/ShaderExecutable9.cpp
@@ -48,6 +48,26 @@
     return static_cast<ShaderExecutable9*>(executable);
 }
 
+bool ShaderExecutable9::getVertexFunction(void *pData, UINT *pSizeOfData)
+{
+    HRESULT hr = D3DERR_INVALIDCALL;
+    if (mVertexExecutable)
+    {
+        hr = mVertexExecutable->GetFunction(pData, pSizeOfData);
+    }
+    return SUCCEEDED(hr);
+}
+
+bool ShaderExecutable9::getPixelFunction(void *pData, UINT *pSizeOfData)
+{
+    HRESULT hr = D3DERR_INVALIDCALL;
+    if (mPixelExecutable)
+    {
+        hr = mPixelExecutable->GetFunction(pData, pSizeOfData);
+    }
+    return SUCCEEDED(hr);
+}
+
 IDirect3DVertexShader9 *ShaderExecutable9::getVertexShader()
 {
     return mVertexExecutable;

src/libGLESv2/renderer/ShaderExecutable9.h

diff --git a/src/libGLESv2/renderer/ShaderExecutable9.h b/src/libGLESv2/renderer/ShaderExecutable9.h
index 721dee0..734ea32 100644
--- a/src/libGLESv2/renderer/ShaderExecutable9.h
+++ b/src/libGLESv2/renderer/ShaderExecutable9.h
@@ -25,6 +25,9 @@
     ShaderExecutable9(IDirect3DVertexShader9 *executable, gl::D3DConstantTable *constantTable);
     virtual ~ShaderExecutable9();
 
+    virtual bool getVertexFunction(void *pData, UINT *pSizeOfData);
+    virtual bool getPixelFunction(void *pData, UINT *pSizeOfData);
+
     static ShaderExecutable9 *makeShaderExecutable9(ShaderExecutable *executable);
 
     IDirect3DPixelShader9 *getPixelShader();