Buildfixes

This commit is contained in:
twinaphex 2016-05-22 16:17:00 +02:00
parent debcce9ff1
commit c69820831e
2 changed files with 16 additions and 16 deletions

View File

@ -50,7 +50,7 @@ bool rsx_gl_open(bool is_pal)
{ {
rsx_gl_is_pal = is_pal; rsx_gl_is_pal = is_pal;
VideoClock clock = is_pal ? Pal : Ntsc; VideoClock clock = is_pal ? VideoClock_Pal : VideoClock_Ntsc;
set_renderer( RetroGl::getInstance(clock) ); set_renderer( RetroGl::getInstance(clock) );
return true; return true;
@ -166,28 +166,28 @@ void rsx_gl_push_triangle(
bool dither, bool dither,
int blend_mode) int blend_mode)
{ {
SemiTransparencyMode semi_transparency_mode = Add; SemiTransparencyMode semi_transparency_mode = SemiTransparencyMode_Add;
bool semi_transparent = false; bool semi_transparent = false;
switch (blend_mode) { switch (blend_mode) {
case -1: case -1:
semi_transparent = false; semi_transparent = false;
semi_transparency_mode = Add; semi_transparency_mode = SemiTransparencyMode_Add;
break; break;
case 0: case 0:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = Average; semi_transparency_mode = SemiTransparencyMode_Average;
break; break;
case 1: case 1:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = Add; semi_transparency_mode = SemiTransparencyMode_Add;
break; break;
case 2: case 2:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = SubtractSource; semi_transparency_mode = SemiTransparencyMode_SubtractSource;
break; break;
case 3: case 3:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = AddQuarterSource; semi_transparency_mode = SemiTransparencyMode_AddQuarterSource;
break; break;
default: default:
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -266,28 +266,28 @@ void rsx_gl_push_line(int16_t p0x,
bool dither, bool dither,
int blend_mode) int blend_mode)
{ {
SemiTransparencyMode semi_transparency_mode = Add; SemiTransparencyMode semi_transparency_mode = SemiTransparencyMode_Add;
bool semi_transparent = false; bool semi_transparent = false;
switch (blend_mode) { switch (blend_mode) {
case -1: case -1:
semi_transparent = false; semi_transparent = false;
semi_transparency_mode = Add; semi_transparency_mode = SemiTransparencyMode_Add;
break; break;
case 0: case 0:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = Average; semi_transparency_mode = SemiTransparencyMode_Average;
break; break;
case 1: case 1:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = Add; semi_transparency_mode = SemiTransparencyMode_Add;
break; break;
case 2: case 2:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = SubtractSource; semi_transparency_mode = SemiTransparencyMode_SubtractSource;
break; break;
case 3: case 3:
semi_transparent = true; semi_transparent = true;
semi_transparency_mode = AddQuarterSource; semi_transparency_mode = SemiTransparencyMode_AddQuarterSource;
break; break;
default: default:
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

View File

@ -28,7 +28,7 @@ RetroGl* RetroGl::getInstance(VideoClock video_clock)
RetroGl* RetroGl::getInstance() RetroGl* RetroGl::getInstance()
{ {
return RetroGl::getInstance(VideoClocl_Ntsc); return RetroGl::getInstance(VideoClock_Ntsc);
} }
RetroGl::RetroGl(VideoClock video_clock) RetroGl::RetroGl(VideoClock video_clock)
@ -73,7 +73,7 @@ RetroGl::RetroGl(VideoClock video_clock)
} }
// No context until `context_reset` is called // No context until `context_reset` is called
this->state = Invalid; this->state = GlState_Invalid;
this->state_data.c = config; this->state_data.c = config;
this->state_data.r = NULL; this->state_data.r = NULL;
@ -159,7 +159,7 @@ void RetroGl::context_destroy()
return; return;
} }
this->state = Invalid; this->state = GlState_Invalid;
this->state_data.c = config; this->state_data.c = config;
} }