jp9000/obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make failing to open or read a shader file a CrashError

Browse Source
This commit is contained in:
Richard Stanway 2014-05-22 21:36:15 +02:00
parent ae0fd664d6
commit 57d0eba4fb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OBSApi/GraphicsSystem.cpp
View File

@ -44,10 +44,12 @@ Shader* GraphicsSystem::CreateVertexShaderFromFile(CTSTR lpFileName)
XFile ShaderFile; XFile ShaderFile;
if(!ShaderFile.Open(lpFileName, XFILE_READ|XFILE_SHARED, XFILE_OPENEXISTING)) if(!ShaderFile.Open(lpFileName, XFILE_READ|XFILE_SHARED, XFILE_OPENEXISTING))
return NULL; CrashError(TEXT("CreateVertexShaderFromFile: Couldn't open %s: %d"), lpFileName, GetLastError());
String strShader; String strShader;
ShaderFile.ReadFileToString(strShader); ShaderFile.ReadFileToString(strShader);
if (strShader.IsEmpty())
CrashError(TEXT("CreateVertexShaderFromFile: Couldn't read %s: %d"), lpFileName, GetLastError());
return CreateVertexShader(strShader, lpFileName); return CreateVertexShader(strShader, lpFileName);
} }
@ -56,11 +58,13 @@ Shader* GraphicsSystem::CreatePixelShaderFromFile(CTSTR lpFileName)
{ {
XFile ShaderFile; XFile ShaderFile;
if(!ShaderFile.Open(lpFileName, XFILE_READ|XFILE_SHARED, XFILE_OPENEXISTING)) if (!ShaderFile.Open(lpFileName, XFILE_READ | XFILE_SHARED, XFILE_OPENEXISTING))
return NULL; CrashError(TEXT("CreatePixelShaderFromFile: Couldn't open %s: %d"), lpFileName, GetLastError());
String strShader; String strShader;
ShaderFile.ReadFileToString(strShader); ShaderFile.ReadFileToString(strShader);
if (strShader.IsEmpty())
CrashError(TEXT("CreatePixelShaderFromFile: Couldn't read %s: %d"), lpFileName, GetLastError());
return CreatePixelShader(strShader, lpFileName); return CreatePixelShader(strShader, lpFileName);
} }