ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NV2A : Tiny corrections

This commit is contained in:
PatrickvL 2018-02-09 16:30:58 +01:00
parent eba4a276d5
commit 12f81c0ade
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -3896,7 +3896,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreatePixelShader)
#if 0 // PatrickvL Dxbx pixel shader translation #if 0 // PatrickvL Dxbx pixel shader translation
// Attempt to recompile PixelShader // Attempt to recompile PixelShader
hRet = DxbxUpdateActivePixelShader(pPSDef, hostShaderHandle); hRet = DxbxUpdateActivePixelShader(pPSDef, &hostShaderHandle);
// redirect to windows d3d // redirect to windows d3d
DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->CreatePixelShader"); DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->CreatePixelShader");
#endif #endif

7
src/devices/video/EmuNV2A_PGRAPH.cpp
View File

@ -526,7 +526,10 @@ static void pgraph_method(NV2AState *d,
unsigned int method, unsigned int method,
uint32_t parameter) uint32_t parameter)
{ {
// int i; #ifdef COMPILE_OPENGL
unsigned int i;
#endif
GraphicsSubchannel *subchannel_data; GraphicsSubchannel *subchannel_data;
GraphicsObject *object; GraphicsObject *object;
@ -3012,7 +3015,7 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
ShaderState state = { ShaderState state = {
.psh = (PshState){ .psh = (PshState){
/* register combier stuff */ /* register combiner stuff */
.combiner_control = pg->regs[NV_PGRAPH_COMBINECTL], .combiner_control = pg->regs[NV_PGRAPH_COMBINECTL],
.shader_stage_program = pg->regs[NV_PGRAPH_SHADERPROG], .shader_stage_program = pg->regs[NV_PGRAPH_SHADERPROG],
.other_stage_input = pg->regs[NV_PGRAPH_SHADERCTL], .other_stage_input = pg->regs[NV_PGRAPH_SHADERCTL],