mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 360) Buildfixes

Browse Source
This commit is contained in:
twinaphex 2017-12-30 12:36:00 +01:00
parent d5d4e9ff2b
commit 20bb653f1e
3 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -149,15 +149,15 @@ static void hlsl_d3d9_renderchain_set_vertices(
{
unsigned i;
Vertex vert[4];
float tex_w = 0.0f;
float tex_h = 0.0f;
void *verts = NULL;
chain->last_width = vert_width;
chain->last_height = vert_height;
float tex_w = vert_width;
float tex_h = vert_height;
tex_w /= ((float)chain->tex_w);
tex_h /= ((float)chain->tex_h);
tex_w = vert_width / ((float)chain->tex_w);
tex_h = vert_height / ((float)chain->tex_h);
vert[0].x = -1.0f;
vert[0].y = -1.0f;

58
gfx/drivers_shader/shader_hlsl.c
View File

@ -65,11 +65,43 @@ typedef struct hlsl_shader_data hlsl_shader_data_t;
#define ID3DXConstantTable_SetDefaults(p,a) (p)->SetDefaults(a);
#endif
#ifndef ID3DXConstantTable_SetFloatArray
#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->SetFloatArray(a,b,c,d)
#endif
#ifndef ID3DXConstantTable_SetFloat
#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->SetFloat(a,b,c)
#endif
#ifndef ID3DXConstantTable_GetBufferPointer
#define ID3DXConstantTable_GetBufferPointer(p) (p)->GetBufferPointer()
#endif
#ifndef ID3DXBuffer_Release
#define ID3DXBuffer_Release(p) (p)->Release()
#endif
#else
#ifndef ID3DXConstantTable_SetDefaults
#define ID3DXConstantTable_SetDefaults(p,a) (p)->lpVtbl->SetDefaults(p,a)
#endif
#ifndef ID3DXConstantTable_SetFloatArray
#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->lpVtbl->SetFloatArray(p,a,b,c,d)
#endif
#ifndef ID3DXConstantTable_SetFloat
#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->lpVtbl->SetFloat(p,a,b,c)
#endif
#ifndef ID3DXConstantTable_GetBufferPointer
#define ID3DXConstantTable_GetBufferPointer(p) (p)->lpVtbl->GetBufferPointer(p)
#endif
#ifndef ID3DXBuffer_Release
#define ID3DXBuffer_Release(p) (p)->lpVtbl->Release(p)
#endif
#endif
@ -132,10 +164,8 @@ static void hlsl_set_uniform_parameter(
}
}
#define set_param_2f(param, xy, constanttable) \
if (param) constanttable->SetFloatArray(d3dr, param, xy, 2)
#define set_param_1f(param, x, constanttable) \
if (param) constanttable->SetFloat(d3dr, param, x)
#define set_param_2f(param, xy, constanttable) if (param) { ID3DXConstantTable_SetFloatArray(constanttable, d3dr, param, xy, 2); }
#define set_param_1f(param, x, constanttable) if (param) { ID3DXConstantTable_SetFloat(constanttable, d3dr, param, x); }
static void hlsl_set_params(void *data, void *shader_data,
unsigned width, unsigned height,
@ -225,24 +255,28 @@ static bool hlsl_compile_program(
{
RARCH_ERR("Cg/HLSL error:\n");
if(listing_f)
RARCH_ERR("Fragment:\n%s\n", (char*)listing_f->GetBufferPointer());
RARCH_ERR("Fragment:\n%s\n", (char*)ID3DXConstantTable_GetBufferPointer(listing_f));
if(listing_v)
RARCH_ERR("Vertex:\n%s\n", (char*)listing_v->GetBufferPointer());
RARCH_ERR("Vertex:\n%s\n", (char*)ID3DXConstantTable_GetBufferPointer(listing_v));
ret = false;
goto end;
}
d3dr->CreatePixelShader((const DWORD*)code_f->GetBufferPointer(), &program->fprg);
d3dr->CreateVertexShader((const DWORD*)code_v->GetBufferPointer(), &program->vprg);
code_f->Release();
code_v->Release();
d3dr->CreatePixelShader((const DWORD*)ID3DXConstantTable_GetBufferPointer(code_f), &program->fprg);
d3dr->CreateVertexShader((const DWORD*)ID3DXConstantTable_GetBufferPointer(code_v), &program->vprg);
ID3DXBuffer_Release(code_f);
ID3DXBuffer_Release(code_v);
end:
if (listing_f)
listing_f->Release();
{
ID3DXBuffer_Release(listing_f);
}
if (listing_v)
listing_v->Release();
{
ID3DXBuffer_Release(listing_v);
}
return ret;
}

2
input/drivers_joypad/xdk_joypad.c
View File

@ -206,7 +206,7 @@ static void xdk_joypad_poll(void)
continue;
#endif
state_cur = &pad_state[port];
state_cur = &pad_state[port];
*state_cur = 0;
*state_cur |= ((state_tmp.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0);