lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove unused texture formats

Browse source
This commit is contained in:
Jaime Passos 2020-07-06 00:58:09 -03:00
parent 3d50bef0e5
commit a739cb0da9
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hardware/hw_cache.c
View file

@ -34,11 +34,7 @@ static INT32 format2bpp(GLTextureFormat_t format)
{ {
if (format == GL_TEXFMT_RGBA) if (format == GL_TEXFMT_RGBA)
return 4; return 4;
else if (format == GL_TEXFMT_RGB_565 else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88)
|| format == GL_TEXFMT_ARGB_1555
|| format == GL_TEXFMT_ARGB_4444
|| format == GL_TEXFMT_ALPHA_INTENSITY_88
|| format == GL_TEXFMT_AP_88)
return 2; return 2;
else else
return 1; return 1;

18
src/hardware/hw_data.h
View file

@ -29,16 +29,14 @@
typedef enum GLTextureFormat_e typedef enum GLTextureFormat_e
{ {
GL_TEXFMT_ALPHA_8 = 0x2, /* (0..0xFF) alpha */ GL_TEXFMT_P_8 = 0x01, /* 8-bit palette */
GL_TEXFMT_INTENSITY_8 = 0x3, /* (0..0xFF) intensity */ GL_TEXFMT_AP_88 = 0x02, /* 8-bit alpha, 8-bit palette */
GL_TEXFMT_ALPHA_INTENSITY_44 = 0x4,
GL_TEXFMT_P_8 = 0x5, /* 8-bit palette */ GL_TEXFMT_RGBA = 0x10, /* 32 bit RGBA! */
GL_TEXFMT_RGBA = 0x6, /* 32 bit RGBA! */
GL_TEXFMT_RGB_565 = 0xa, GL_TEXFMT_ALPHA_8 = 0x20, /* (0..0xFF) alpha */
GL_TEXFMT_ARGB_1555 = 0xb, GL_TEXFMT_INTENSITY_8 = 0x21, /* (0..0xFF) intensity */
GL_TEXFMT_ARGB_4444 = 0xc, GL_TEXFMT_ALPHA_INTENSITY_88 = 0x22,
GL_TEXFMT_ALPHA_INTENSITY_88 = 0xd,
GL_TEXFMT_AP_88 = 0xe, /* 8-bit alpha 8-bit palette */
} GLTextureFormat_t; } GLTextureFormat_t;
// data holds the address of the graphics data cached in heap memory // data holds the address of the graphics data cached in heap memory

6
src/hardware/r_opengl/r_opengl.c
View file

@ -2971,11 +2971,7 @@ EXPORT INT32 HWRAPI(GetTextureUsed) (void)
int format = tmp->format; int format = tmp->format;
if (format == GL_TEXFMT_RGBA) if (format == GL_TEXFMT_RGBA)
bpp = 4; bpp = 4;
else if (format == GL_TEXFMT_RGB_565 else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88)
|| format == GL_TEXFMT_ARGB_1555
|| format == GL_TEXFMT_ARGB_4444
|| format == GL_TEXFMT_ALPHA_INTENSITY_88
|| format == GL_TEXFMT_AP_88)
bpp = 2; bpp = 2;
// Add it up! // Add it up!