actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove SDL_SRCCOLORKEY

Browse Source
This commit is contained in:
Glenn Maynard
2004-05-17 01:49:09 +00:00
parent d92317f7cd
commit 70a90469e9
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.cpp
+1 -2
View File
@@ -1197,8 +1197,7 @@ unsigned RageDisplay_D3D::CreateTexture(
pal.p[i].peRed = c.r; pal.p[i].peRed = c.r;
pal.p[i].peGreen = c.g; pal.p[i].peGreen = c.g;
pal.p[i].peBlue = c.b; pal.p[i].peBlue = c.b;
bool bIsColorKey = img->flags & SDL_SRCCOLORKEY && (unsigned)i == img->format->colorkey; pal.p[i].peFlags = c.unused;
pal.p[i].peFlags = bIsColorKey ? BYTE(0x00) : c.unused;
} }
ASSERT( g_TexResourceToTexturePalette.find(uTexHandle) == g_TexResourceToTexturePalette.end() ); ASSERT( g_TexResourceToTexturePalette.find(uTexHandle) == g_TexResourceToTexturePalette.end() );
stepmania/src/RageDisplay_OGL.cpp
-4
View File
@@ -1696,10 +1696,6 @@ unsigned RageDisplay_OGL::CreateTexture(
palette[p++] = img->format->palette->colors[i].r; palette[p++] = img->format->palette->colors[i].r;
palette[p++] = img->format->palette->colors[i].g; palette[p++] = img->format->palette->colors[i].g;
palette[p++] = img->format->palette->colors[i].b; palette[p++] = img->format->palette->colors[i].b;
if(img->flags & SDL_SRCCOLORKEY && i == int(img->format->colorkey))
palette[p++] = 0;
else
palette[p++] = img->format->palette->colors[i].unused; palette[p++] = img->format->palette->colors[i].unused;
} }