From 4c63b7abe8aabcff882fd838e489980da91ad593 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 31 Jan 2011 23:37:30 -0800 Subject: [PATCH] Making the API simpler, texture color and alpha modulation are supported by all renderers. --- include/SDL_video.h | 1 - src/video/SDL_renderer_gl.c | 20 ------- src/video/SDL_renderer_gles.c | 20 ------- src/video/SDL_renderer_sw.c | 6 +-- src/video/SDL_sysvideo.h | 2 - src/video/SDL_video.c | 30 ++++++----- src/video/directfb/SDL_DirectFB_render.c | 23 -------- src/video/nds/SDL_ndsrender.c | 22 -------- src/video/photon/SDL_photon_render.c | 67 ------------------------ src/video/qnxgf/SDL_gf_render.c | 20 ------- src/video/windows/SDL_d3drender.c | 23 -------- 11 files changed, 20 insertions(+), 214 deletions(-) diff --git a/include/SDL_video.h b/include/SDL_video.h index 4cc7026b9..f54c720d7 100644 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -186,7 +186,6 @@ typedef struct SDL_RendererInfo { const char *name; /**< The name of the renderer */ Uint32 flags; /**< Supported ::SDL_RendererFlags */ - Uint32 mod_modes; /**< A mask of supported channel modulation */ Uint32 num_texture_formats; /**< The number of available texture formats */ Uint32 texture_formats[50]; /**< The available texture formats */ int max_texture_width; /**< The maximimum texture width */ diff --git a/src/video/SDL_renderer_gl.c b/src/video/SDL_renderer_gl.c index 005fa3aaa..bf346d1dd 100644 --- a/src/video/SDL_renderer_gl.c +++ b/src/video/SDL_renderer_gl.c @@ -79,10 +79,6 @@ static int GL_SetTexturePalette(SDL_Renderer * renderer, static int GL_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int GL_SetTextureColorMod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int GL_SetTextureAlphaMod(SDL_Renderer * renderer, - SDL_Texture * texture); static int GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -118,8 +114,6 @@ SDL_RenderDriver GL_RenderDriver = { "opengl", (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | - SDL_TEXTUREMODULATE_ALPHA), 15, { SDL_PIXELFORMAT_INDEX1LSB, @@ -291,8 +285,6 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = GL_QueryTexturePixels; renderer->SetTexturePalette = GL_SetTexturePalette; renderer->GetTexturePalette = GL_GetTexturePalette; - renderer->SetTextureColorMod = GL_SetTextureColorMod; - renderer->SetTextureAlphaMod = GL_SetTextureAlphaMod; renderer->UpdateTexture = GL_UpdateTexture; renderer->LockTexture = GL_LockTexture; renderer->UnlockTexture = GL_UnlockTexture; @@ -947,18 +939,6 @@ SetupTextureUpdate(GL_RenderData * renderdata, SDL_Texture * texture, HACK_RYAN_FIXME); } -static int -GL_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - -static int -GL_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - static int GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch) diff --git a/src/video/SDL_renderer_gles.c b/src/video/SDL_renderer_gles.c index e634d02a1..f100483ce 100644 --- a/src/video/SDL_renderer_gles.c +++ b/src/video/SDL_renderer_gles.c @@ -67,10 +67,6 @@ static int GLES_SetTexturePalette(SDL_Renderer * renderer, static int GLES_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int GLES_SetTextureColorMod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int GLES_SetTextureAlphaMod(SDL_Renderer * renderer, - SDL_Texture * texture); static int GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -104,8 +100,6 @@ SDL_RenderDriver GL_ES_RenderDriver = { "opengl_es", (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | - SDL_TEXTUREMODULATE_ALPHA), { /* OpenGL ES 1.x supported formats list */ SDL_PIXELFORMAT_RGBA4444, @@ -231,8 +225,6 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = GLES_QueryTexturePixels; renderer->SetTexturePalette = GLES_SetTexturePalette; renderer->GetTexturePalette = GLES_GetTexturePalette; - renderer->SetTextureColorMod = GLES_SetTextureColorMod; - renderer->SetTextureAlphaMod = GLES_SetTextureAlphaMod; renderer->UpdateTexture = GLES_UpdateTexture; renderer->LockTexture = GLES_LockTexture; renderer->UnlockTexture = GLES_UnlockTexture; @@ -496,18 +488,6 @@ SetupTextureUpdate(GLES_RenderData * renderdata, SDL_Texture * texture, renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1); } -static int -GLES_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - -static int -GLES_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - static int GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch) diff --git a/src/video/SDL_renderer_sw.c b/src/video/SDL_renderer_sw.c index 56996c75c..a03289ab5 100644 --- a/src/video/SDL_renderer_sw.c +++ b/src/video/SDL_renderer_sw.c @@ -49,6 +49,8 @@ static int SW_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture); static int SW_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture); +static int SW_SetTextureBlendMode(SDL_Renderer * renderer, + SDL_Texture * texture); static int SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -82,8 +84,6 @@ SDL_RenderDriver SW_RenderDriver = { (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY | SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | - SDL_TEXTUREMODULATE_ALPHA), 14, { SDL_PIXELFORMAT_INDEX8, @@ -172,12 +172,12 @@ Setup_SoftwareRenderer(SDL_Renderer * renderer) renderer->GetTexturePalette = SW_GetTexturePalette; renderer->SetTextureColorMod = SW_SetTextureColorMod; renderer->SetTextureAlphaMod = SW_SetTextureAlphaMod; + renderer->SetTextureBlendMode = SW_SetTextureBlendMode; renderer->UpdateTexture = SW_UpdateTexture; renderer->LockTexture = SW_LockTexture; renderer->UnlockTexture = SW_UnlockTexture; renderer->DestroyTexture = SW_DestroyTexture; - renderer->info.mod_modes = SW_RenderDriver.info.mod_modes; renderer->info.num_texture_formats = SW_RenderDriver.info.num_texture_formats; SDL_memcpy(renderer->info.texture_formats, diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h index 3234e7823..7b90cfc10 100644 --- a/src/video/SDL_sysvideo.h +++ b/src/video/SDL_sysvideo.h @@ -86,8 +86,6 @@ struct SDL_Renderer void (*UnlockTexture) (SDL_Renderer * renderer, SDL_Texture * texture); void (*DirtyTexture) (SDL_Renderer * renderer, SDL_Texture * texture, int numrects, const SDL_Rect * rects); - int (*SetDrawColor) (SDL_Renderer * renderer); - int (*SetDrawBlendMode) (SDL_Renderer * renderer); int (*RenderClear) (SDL_Renderer * renderer); int (*RenderDrawPoints) (SDL_Renderer * renderer, const SDL_Point * points, int count); diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 1cc0a0930..2d930acd6 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -2074,7 +2074,11 @@ SDL_SetTextureColorMod(SDL_Texture * texture, Uint8 r, Uint8 g, Uint8 b) texture->r = r; texture->g = g; texture->b = b; - return renderer->SetTextureColorMod(renderer, texture); + if (renderer->SetTextureColorMod) { + return renderer->SetTextureColorMod(renderer, texture); + } else { + return 0; + } } int @@ -2116,7 +2120,11 @@ SDL_SetTextureAlphaMod(SDL_Texture * texture, Uint8 alpha) texture->modMode &= ~SDL_TEXTUREMODULATE_ALPHA; } texture->a = alpha; - return renderer->SetTextureAlphaMod(renderer, texture); + if (renderer->SetTextureAlphaMod) { + return renderer->SetTextureAlphaMod(renderer, texture); + } else { + return 0; + } } int @@ -2143,7 +2151,11 @@ SDL_SetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode blendMode) return -1; } texture->blendMode = blendMode; - return renderer->SetTextureBlendMode(renderer, texture); + if (renderer->SetTextureBlendMode) { + return renderer->SetTextureBlendMode(renderer, texture); + } else { + return 0; + } } int @@ -2258,11 +2270,7 @@ SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a) renderer->g = g; renderer->b = b; renderer->a = a; - if (renderer->SetDrawColor) { - return renderer->SetDrawColor(renderer); - } else { - return 0; - } + return 0; } int @@ -2299,11 +2307,7 @@ SDL_SetRenderDrawBlendMode(SDL_BlendMode blendMode) return -1; } renderer->blendMode = blendMode; - if (renderer->SetDrawBlendMode) { - return renderer->SetDrawBlendMode(renderer); - } else { - return 0; - } + return 0; } int diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c index 056eedae0..e18c02493 100644 --- a/src/video/directfb/SDL_DirectFB_render.c +++ b/src/video/directfb/SDL_DirectFB_render.c @@ -51,10 +51,6 @@ static int DirectFB_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int DirectFB_SetTextureAlphaMod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int DirectFB_SetTextureColorMod(SDL_Renderer * renderer, - SDL_Texture * texture); static int DirectFB_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, @@ -68,7 +64,6 @@ static void DirectFB_UnlockTexture(SDL_Renderer * renderer, static void DirectFB_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture, int numrects, const SDL_Rect * rects); -static int DirectFB_SetDrawBlendMode(SDL_Renderer * renderer); static int DirectFB_RenderDrawPoints(SDL_Renderer * renderer, const SDL_Point * points, int count); static int DirectFB_RenderDrawLines(SDL_Renderer * renderer, @@ -96,8 +91,6 @@ SDL_RenderDriver DirectFB_RenderDriver = { SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | - SDL_TEXTUREMODULATE_ALPHA), 14, { SDL_PIXELFORMAT_INDEX4LSB, @@ -275,16 +268,12 @@ DirectFB_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = DirectFB_QueryTexturePixels; renderer->SetTexturePalette = DirectFB_SetTexturePalette; renderer->GetTexturePalette = DirectFB_GetTexturePalette; - renderer->SetTextureAlphaMod = DirectFB_SetTextureAlphaMod; - renderer->SetTextureColorMod = DirectFB_SetTextureColorMod; renderer->UpdateTexture = DirectFB_UpdateTexture; renderer->LockTexture = DirectFB_LockTexture; renderer->UnlockTexture = DirectFB_UnlockTexture; renderer->DirtyTexture = DirectFB_DirtyTexture; renderer->RenderDrawPoints = DirectFB_RenderDrawPoints; renderer->RenderDrawLines = DirectFB_RenderDrawLines; - /* SetDrawColor - no needed */ - renderer->SetDrawBlendMode = DirectFB_SetDrawBlendMode; renderer->RenderFillRects = DirectFB_RenderFillRects; renderer->RenderDrawRects = DirectFB_RenderDrawRects; /* RenderDrawEllipse - no reference implementation yet */ @@ -635,18 +624,6 @@ DirectFB_GetTexturePalette(SDL_Renderer * renderer, return -1; } -static int -DirectFB_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - -static int -DirectFB_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - static int DirectFB_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture) { diff --git a/src/video/nds/SDL_ndsrender.c b/src/video/nds/SDL_ndsrender.c index 43a9f1d9e..3041bf325 100644 --- a/src/video/nds/SDL_ndsrender.c +++ b/src/video/nds/SDL_ndsrender.c @@ -50,10 +50,6 @@ static int NDS_SetTexturePalette(SDL_Renderer * renderer, static int NDS_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int NDS_SetTextureColorMod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int NDS_SetTextureAlphaMod(SDL_Renderer * renderer, - SDL_Texture * texture); static int NDS_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -76,7 +72,6 @@ SDL_RenderDriver NDS_RenderDriver = { NDS_CreateRenderer, {"nds", /* char* name */ (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC), /* u32 flags */ - (SDL_TEXTUREMODULATE_NONE), /* u32 mod_modes */ 3, /* u32 num_texture_formats */ { SDL_PIXELFORMAT_INDEX8, @@ -175,14 +170,11 @@ NDS_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = NDS_QueryTexturePixels; renderer->SetTexturePalette = NDS_SetTexturePalette; renderer->GetTexturePalette = NDS_GetTexturePalette; - renderer->SetTextureColorMod = NDS_SetTextureColorMod; - renderer->SetTextureAlphaMod = NDS_SetTextureAlphaMod; renderer->UpdateTexture = NDS_UpdateTexture; renderer->LockTexture = NDS_LockTexture; renderer->UnlockTexture = NDS_UnlockTexture; renderer->DestroyTexture = NDS_DestroyTexture; - renderer->info.mod_modes = NDS_RenderDriver.info.mod_modes; renderer->info.num_texture_formats = NDS_RenderDriver.info.num_texture_formats; SDL_memcpy(renderer->info.texture_formats, @@ -557,18 +549,4 @@ NDS_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, return 0; } -static int -NDS_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - /* stub! */ - return 0; -} - -static int -NDS_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - /* stub! */ - return 0; -} - /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/photon/SDL_photon_render.c b/src/video/photon/SDL_photon_render.c index a3b722199..090827116 100644 --- a/src/video/photon/SDL_photon_render.c +++ b/src/video/photon/SDL_photon_render.c @@ -54,12 +54,6 @@ static int photon_settexturepalette(SDL_Renderer * renderer, static int photon_gettexturepalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int photon_settexturecolormod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int photon_settexturealphamod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int photon_settexturescalemode(SDL_Renderer * renderer, - SDL_Texture * texture); static int photon_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -71,7 +65,6 @@ static void photon_unlocktexture(SDL_Renderer * renderer, static void photon_dirtytexture(SDL_Renderer * renderer, SDL_Texture * texture, int numrects, const SDL_Rect * rects); -static int photon_setdrawcolor(SDL_Renderer * renderer); static int photon_renderpoint(SDL_Renderer * renderer, int x, int y); static int photon_renderline(SDL_Renderer * renderer, int x1, int y1, int x2, int y2); @@ -98,7 +91,6 @@ SDL_RenderDriver photon_renderdriver = { SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_ALPHA), 10, {SDL_PIXELFORMAT_INDEX8, SDL_PIXELFORMAT_RGB555, @@ -144,13 +136,10 @@ photon_createrenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = photon_querytexturepixels; renderer->SetTexturePalette = photon_settexturepalette; renderer->GetTexturePalette = photon_gettexturepalette; - renderer->SetTextureAlphaMod = photon_settexturealphamod; - renderer->SetTextureColorMod = photon_settexturecolormod; renderer->UpdateTexture = photon_updatetexture; renderer->LockTexture = photon_locktexture; renderer->UnlockTexture = photon_unlocktexture; renderer->DirtyTexture = photon_dirtytexture; - renderer->SetDrawColor = photon_setdrawcolor; renderer->RenderPoint = photon_renderpoint; renderer->RenderLine = photon_renderline; renderer->RenderFill = photon_renderfill; @@ -871,35 +860,6 @@ photon_gettexturepalette(SDL_Renderer * renderer, SDL_Texture * texture, return -1; } -static int -photon_settexturecolormod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - SDL_Unsupported(); - return -1; -} - -static int -photon_settexturealphamod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata; - - /* Check, if it is not initialized */ - if (rdata->surfaces_type==SDL_PHOTON_SURFTYPE_UNKNOWN) - { - SDL_SetError("Photon: can't set texture blend mode for OpenGL ES window"); - return -1; - } - - /* Check if current renderer instance supports alpha modulation */ - if ((renderer->info.mod_modes & SDL_TEXTUREMODULATE_ALPHA)!=SDL_TEXTUREMODULATE_ALPHA) - { - SDL_Unsupported(); - return -1; - } - - return 0; -} - static int photon_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch) @@ -1024,33 +984,6 @@ photon_dirtytexture(SDL_Renderer * renderer, SDL_Texture * texture, } } -static int -photon_setdrawcolor(SDL_Renderer * renderer) -{ - SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata; - - /* Check, if it is not initialized */ - if (rdata->surfaces_type==SDL_PHOTON_SURFTYPE_UNKNOWN) - { - SDL_SetError("Photon: can't set draw color for OpenGL ES window"); - return -1; - } - - switch (rdata->surfaces_type) - { - case SDL_PHOTON_SURFTYPE_OFFSCREEN: - case SDL_PHOTON_SURFTYPE_PHIMAGE: - PgSetFillColorCx(rdata->gc, PgRGB(renderer->r, renderer->g, renderer->b)); - PgSetStrokeColorCx(rdata->gc, PgRGB(renderer->r, renderer->g, renderer->b)); - break; - case SDL_PHOTON_SURFTYPE_UNKNOWN: - default: - break; - } - - return 0; -} - static int photon_renderpoint(SDL_Renderer * renderer, int x, int y) { diff --git a/src/video/qnxgf/SDL_gf_render.c b/src/video/qnxgf/SDL_gf_render.c index 593cc7772..aa8a3a491 100644 --- a/src/video/qnxgf/SDL_gf_render.c +++ b/src/video/qnxgf/SDL_gf_render.c @@ -48,12 +48,6 @@ static int gf_settexturepalette(SDL_Renderer * renderer, static int gf_gettexturepalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int gf_settexturecolormod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int gf_settexturealphamod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int gf_settexturescalemode(SDL_Renderer * renderer, - SDL_Texture * texture); static int gf_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -81,8 +75,6 @@ SDL_RenderDriver gf_renderdriver = { SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | - SDL_TEXTUREMODULATE_ALPHA), 13, { SDL_PIXELFORMAT_INDEX8, @@ -141,8 +133,6 @@ gf_createrenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = gf_querytexturepixels; renderer->SetTexturePalette = gf_settexturepalette; renderer->GetTexturePalette = gf_gettexturepalette; - renderer->SetTextureAlphaMod = gf_settexturealphamod; - renderer->SetTextureColorMod = gf_settexturecolormod; renderer->UpdateTexture = gf_updatetexture; renderer->LockTexture = gf_locktexture; renderer->UnlockTexture = gf_unlocktexture; @@ -327,16 +317,6 @@ gf_gettexturepalette(SDL_Renderer * renderer, SDL_Texture * texture, { } -static int -gf_settexturecolormod(SDL_Renderer * renderer, SDL_Texture * texture) -{ -} - -static int -gf_settexturealphamod(SDL_Renderer * renderer, SDL_Texture * texture) -{ -} - static int gf_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch) diff --git a/src/video/windows/SDL_d3drender.c b/src/video/windows/SDL_d3drender.c index fbdd95feb..758bbaddb 100644 --- a/src/video/windows/SDL_d3drender.c +++ b/src/video/windows/SDL_d3drender.c @@ -101,12 +101,6 @@ static int D3D_SetTexturePalette(SDL_Renderer * renderer, static int D3D_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, SDL_Color * colors, int firstcolor, int ncolors); -static int D3D_SetTextureColorMod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int D3D_SetTextureAlphaMod(SDL_Renderer * renderer, - SDL_Texture * texture); -static int D3D_SetTextureBlendMode(SDL_Renderer * renderer, - SDL_Texture * texture); static int D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -144,8 +138,6 @@ SDL_RenderDriver D3D_RenderDriver = { SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), - (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | - SDL_TEXTUREMODULATE_ALPHA), 0, {0}, 0, @@ -451,9 +443,6 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueryTexturePixels = D3D_QueryTexturePixels; renderer->SetTexturePalette = D3D_SetTexturePalette; renderer->GetTexturePalette = D3D_GetTexturePalette; - renderer->SetTextureColorMod = D3D_SetTextureColorMod; - renderer->SetTextureAlphaMod = D3D_SetTextureAlphaMod; - renderer->SetTextureBlendMode = D3D_SetTextureBlendMode; renderer->UpdateTexture = D3D_UpdateTexture; renderer->LockTexture = D3D_LockTexture; renderer->UnlockTexture = D3D_UnlockTexture; @@ -727,18 +716,6 @@ D3D_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture, return 0; } -static int -D3D_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - -static int -D3D_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture) -{ - return 0; -} - static int D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch)