From c69820831e501199026042cec9538a5ffceccb23 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 22 May 2016 16:17:00 +0200 Subject: [PATCH] Buildfixes --- rsx/rsx_lib_gl.cpp | 26 +++++++++++----------- rustation-libretro/src/retrogl/retrogl.cpp | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rsx/rsx_lib_gl.cpp b/rsx/rsx_lib_gl.cpp index d64f5b76..af832f2f 100644 --- a/rsx/rsx_lib_gl.cpp +++ b/rsx/rsx_lib_gl.cpp @@ -50,7 +50,7 @@ bool rsx_gl_open(bool 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) ); return true; @@ -166,28 +166,28 @@ void rsx_gl_push_triangle( bool dither, int blend_mode) { - SemiTransparencyMode semi_transparency_mode = Add; + SemiTransparencyMode semi_transparency_mode = SemiTransparencyMode_Add; bool semi_transparent = false; switch (blend_mode) { case -1: semi_transparent = false; - semi_transparency_mode = Add; + semi_transparency_mode = SemiTransparencyMode_Add; break; case 0: semi_transparent = true; - semi_transparency_mode = Average; + semi_transparency_mode = SemiTransparencyMode_Average; break; case 1: semi_transparent = true; - semi_transparency_mode = Add; + semi_transparency_mode = SemiTransparencyMode_Add; break; case 2: semi_transparent = true; - semi_transparency_mode = SubtractSource; + semi_transparency_mode = SemiTransparencyMode_SubtractSource; break; case 3: semi_transparent = true; - semi_transparency_mode = AddQuarterSource; + semi_transparency_mode = SemiTransparencyMode_AddQuarterSource; break; default: exit(EXIT_FAILURE); @@ -266,28 +266,28 @@ void rsx_gl_push_line(int16_t p0x, bool dither, int blend_mode) { - SemiTransparencyMode semi_transparency_mode = Add; + SemiTransparencyMode semi_transparency_mode = SemiTransparencyMode_Add; bool semi_transparent = false; switch (blend_mode) { case -1: semi_transparent = false; - semi_transparency_mode = Add; + semi_transparency_mode = SemiTransparencyMode_Add; break; case 0: semi_transparent = true; - semi_transparency_mode = Average; + semi_transparency_mode = SemiTransparencyMode_Average; break; case 1: semi_transparent = true; - semi_transparency_mode = Add; + semi_transparency_mode = SemiTransparencyMode_Add; break; case 2: semi_transparent = true; - semi_transparency_mode = SubtractSource; + semi_transparency_mode = SemiTransparencyMode_SubtractSource; break; case 3: semi_transparent = true; - semi_transparency_mode = AddQuarterSource; + semi_transparency_mode = SemiTransparencyMode_AddQuarterSource; break; default: exit(EXIT_FAILURE); diff --git a/rustation-libretro/src/retrogl/retrogl.cpp b/rustation-libretro/src/retrogl/retrogl.cpp index 677a7fd5..99aeed37 100644 --- a/rustation-libretro/src/retrogl/retrogl.cpp +++ b/rustation-libretro/src/retrogl/retrogl.cpp @@ -28,7 +28,7 @@ RetroGl* RetroGl::getInstance(VideoClock video_clock) RetroGl* RetroGl::getInstance() { - return RetroGl::getInstance(VideoClocl_Ntsc); + return RetroGl::getInstance(VideoClock_Ntsc); } RetroGl::RetroGl(VideoClock video_clock) @@ -73,7 +73,7 @@ RetroGl::RetroGl(VideoClock video_clock) } // No context until `context_reset` is called - this->state = Invalid; + this->state = GlState_Invalid; this->state_data.c = config; this->state_data.r = NULL; @@ -159,7 +159,7 @@ void RetroGl::context_destroy() return; } - this->state = Invalid; + this->state = GlState_Invalid; this->state_data.c = config; }