Fixed compiler warnings

libsdl-org · Aug 15, 2017 · 9451cd8 · 9451cd8
1 parent aebe17d
commit 9451cd8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
@@ -2095,35 +2095,37 @@ int SDL_GL_UnbindTexture(SDL_Texture *texture)
 static SDL_BlendMode
 SDL_GetShortBlendMode(SDL_BlendMode blendMode)
 {
-    switch (blendMode) {
-    case SDL_BLENDMODE_NONE_FULL:
+    if (blendMode == SDL_BLENDMODE_NONE_FULL) {
         return SDL_BLENDMODE_NONE;
-    case SDL_BLENDMODE_BLEND_FULL:
+    }
+    if (blendMode == SDL_BLENDMODE_BLEND_FULL) {
         return SDL_BLENDMODE_BLEND;
-    case SDL_BLENDMODE_ADD_FULL:
+    }
+    if (blendMode == SDL_BLENDMODE_ADD_FULL) {
         return SDL_BLENDMODE_ADD;
-    case SDL_BLENDMODE_MOD_FULL:
+    }
+    if (blendMode == SDL_BLENDMODE_MOD_FULL) {
         return SDL_BLENDMODE_MOD;
-    default:
-        return blendMode;
     }
+    return blendMode;
 }
 
 static SDL_BlendMode
 SDL_GetLongBlendMode(SDL_BlendMode blendMode)
 {
-    switch (blendMode) {
-    case SDL_BLENDMODE_NONE:
+    if (blendMode == SDL_BLENDMODE_NONE) {
         return SDL_BLENDMODE_NONE_FULL;
-    case SDL_BLENDMODE_BLEND:
+    }
+    if (blendMode == SDL_BLENDMODE_BLEND) {
         return SDL_BLENDMODE_BLEND_FULL;
-    case SDL_BLENDMODE_ADD:
+    }
+    if (blendMode == SDL_BLENDMODE_ADD) {
         return SDL_BLENDMODE_ADD_FULL;
-    case SDL_BLENDMODE_MOD:
+    }
+    if (blendMode == SDL_BLENDMODE_MOD) {
         return SDL_BLENDMODE_MOD_FULL;
-    default:
-        return blendMode;
     }
+    return blendMode;
 }
 
 SDL_BlendMode

diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
@@ -642,7 +642,6 @@ static GLenum GetBlendEquation(SDL_BlendOperation operation)
 static SDL_bool
 GL_SupportsBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode)
 {
-    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
     SDL_BlendFactor srcColorFactor = SDL_GetBlendModeSrcColorFactor(blendMode);
     SDL_BlendFactor srcAlphaFactor = SDL_GetBlendModeSrcAlphaFactor(blendMode);
     SDL_BlendOperation colorOperation = SDL_GetBlendModeColorOperation(blendMode);

diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
@@ -416,7 +416,6 @@ static GLenum GetBlendEquation(SDL_BlendOperation operation)
 static SDL_bool
 GLES2_SupportsBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode)
 {
-    GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
     SDL_BlendFactor srcColorFactor = SDL_GetBlendModeSrcColorFactor(blendMode);
     SDL_BlendFactor srcAlphaFactor = SDL_GetBlendModeSrcAlphaFactor(blendMode);
     SDL_BlendOperation colorOperation = SDL_GetBlendModeColorOperation(blendMode);