Inline the Renderer9::compilerShaderSource function

Trac #22155 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1506 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 95892416
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <d3dcompiler.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -597,12 +597,6 @@ void Renderer9::freeEventQuery(IDirect3DQuery9* query) ...@@ -597,12 +597,6 @@ void Renderer9::freeEventQuery(IDirect3DQuery9* query)
} }
} }
HRESULT Renderer9::compileShaderSource(const char* hlsl, const char* sourceName, const char* profile, DWORD flags, ID3DBlob** binary, ID3DBlob** errorMessage)
{
return mD3DCompileFunc(hlsl, strlen(hlsl), sourceName, NULL, NULL, "main", profile, flags, 0, binary, errorMessage);
}
IDirect3DVertexShader9 *Renderer9::createVertexShader(const DWORD *function, size_t length) IDirect3DVertexShader9 *Renderer9::createVertexShader(const DWORD *function, size_t length)
{ {
return mVertexShaderCache.create(function, length); return mVertexShaderCache.create(function, length);
...@@ -2748,8 +2742,8 @@ ID3D10Blob *Renderer9::compileToBinary(gl::InfoLog &infoLog, const char *hlsl, c ...@@ -2748,8 +2742,8 @@ ID3D10Blob *Renderer9::compileToBinary(gl::InfoLog &infoLog, const char *hlsl, c
{ {
ID3D10Blob *errorMessage = NULL; ID3D10Blob *errorMessage = NULL;
ID3D10Blob *binary = NULL; ID3D10Blob *binary = NULL;
result = compileShaderSource(hlsl, gl::g_fakepath, profile, flags | extraFlags[i], &binary, &errorMessage); result = mD3DCompileFunc(hlsl, strlen(hlsl), gl::g_fakepath, NULL, NULL,
"main", profile, flags | extraFlags[i], 0, &binary, &errorMessage);
if (errorMessage) if (errorMessage)
{ {
const char *message = (const char*)errorMessage->GetBufferPointer(); const char *message = (const char*)errorMessage->GetBufferPointer();
......
...@@ -67,7 +67,6 @@ class Renderer9 : public Renderer ...@@ -67,7 +67,6 @@ class Renderer9 : public Renderer
// resource creation // resource creation
IDirect3DVertexShader9 *createVertexShader(const DWORD *function, size_t length); IDirect3DVertexShader9 *createVertexShader(const DWORD *function, size_t length);
IDirect3DPixelShader9 *createPixelShader(const DWORD *function, size_t length); IDirect3DPixelShader9 *createPixelShader(const DWORD *function, size_t length);
HRESULT compileShaderSource(const char* hlsl, const char* sourceName, const char* profile, DWORD flags, ID3DBlob** binary, ID3DBlob** errorMessage);
HRESULT createVertexBuffer(UINT Length, DWORD Usage, IDirect3DVertexBuffer9 **ppVertexBuffer); HRESULT createVertexBuffer(UINT Length, DWORD Usage, IDirect3DVertexBuffer9 **ppVertexBuffer);
HRESULT createIndexBuffer(UINT Length, DWORD Usage, D3DFORMAT Format, IDirect3DIndexBuffer9 **ppIndexBuffer); HRESULT createIndexBuffer(UINT Length, DWORD Usage, D3DFORMAT Format, IDirect3DIndexBuffer9 **ppIndexBuffer);
#if 0 #if 0
......
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