From 73b8de78488cc86651683c90306d1b0cfad34b6a Mon Sep 17 00:00:00 2001 From: Cooper Partin Date: Tue, 28 Oct 2014 08:34:30 -0700 Subject: Fixed D3DDisassemble function dynamic GetProcAddress failure on WinRT Change-Id: I32a345803c9183e0b9b77d529027711f8c8e1ad8 Reviewed-on: https://chromium-review.googlesource.com/225847 Tested-by: Cooper Partin Reviewed-by: Jamie Madill Reviewed-by: Geoff Lang --- src/libGLESv2/renderer/d3d/HLSLCompiler.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp b/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp index 78a61f41..a67d2744 100644 --- a/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp +++ b/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp @@ -148,16 +148,18 @@ bool HLSLCompiler::initialize() mD3DCompileFunc = reinterpret_cast(GetProcAddress(mD3DCompilerModule, "D3DCompile")); ASSERT(mD3DCompileFunc); + + mD3DDisassembleFunc = reinterpret_cast(GetProcAddress(mD3DCompilerModule, "D3DDisassemble")); + ASSERT(mD3DDisassembleFunc); + #else // D3D Shader compiler is linked already into this module, so the export // can be directly assigned. mD3DCompilerModule = NULL; mD3DCompileFunc = reinterpret_cast(D3DCompile); + mD3DDisassembleFunc = reinterpret_cast(D3DDisassemble); #endif - mD3DDisassembleFunc = reinterpret_cast(GetProcAddress(mD3DCompilerModule, "D3DDisassemble")); - ASSERT(mD3DDisassembleFunc); - return mD3DCompileFunc != NULL; } -- cgit v1.2.3