From 9451cd81ae7553f31a69c8c4b359055a648a0828 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 14 Aug 2017 20:07:30 -0700 Subject: [PATCH] Fixed compiler warnings --- src/render/SDL_render.c | 42 +++++++++++++------------ src/render/opengl/SDL_render_gl.c | 1 - src/render/opengles2/SDL_render_gles2.c | 1 - 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c index d5030fea8..942a719f1 100644 --- 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: - return SDL_BLENDMODE_BLEND; - case SDL_BLENDMODE_ADD_FULL: - return SDL_BLENDMODE_ADD; - case SDL_BLENDMODE_MOD_FULL: - return SDL_BLENDMODE_MOD; - default: - return blendMode; } + if (blendMode == SDL_BLENDMODE_BLEND_FULL) { + return SDL_BLENDMODE_BLEND; + } + if (blendMode == SDL_BLENDMODE_ADD_FULL) { + return SDL_BLENDMODE_ADD; + } + if (blendMode == SDL_BLENDMODE_MOD_FULL) { + return SDL_BLENDMODE_MOD; + } + 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: - return SDL_BLENDMODE_BLEND_FULL; - case SDL_BLENDMODE_ADD: - return SDL_BLENDMODE_ADD_FULL; - case SDL_BLENDMODE_MOD: - return SDL_BLENDMODE_MOD_FULL; - default: - return blendMode; } + if (blendMode == SDL_BLENDMODE_BLEND) { + return SDL_BLENDMODE_BLEND_FULL; + } + if (blendMode == SDL_BLENDMODE_ADD) { + return SDL_BLENDMODE_ADD_FULL; + } + if (blendMode == SDL_BLENDMODE_MOD) { + return SDL_BLENDMODE_MOD_FULL; + } + return blendMode; } SDL_BlendMode diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c index 456f3cea3..5c1dd825a 100644 --- 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 index ebd1e9260..07bef5505 100644 --- 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);