YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-18 19:10:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge 4529 update

Browse Source
This commit is contained in:
Alibek Omarov 2019-07-02 23:44:42 +03:00
commit 8320f0598f
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/common/build.c
View File

@ -48,7 +48,7 @@ int Q_buildnum( void )
return b;
#else
return 4511;
return 4529;
#endif
}

1
ref_gl/gl_export.h
View File

@ -398,6 +398,7 @@ typedef float GLmatrix[16];
#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837
#define GL_COMPRESSED_ALPHA_ARB 0x84E9
#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB

13
ref_gl/gl_image.c
View File

@ -396,6 +396,8 @@ static size_t GL_CalcTextureSize( GLenum format, int width, int height, int dept
case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
size = (((width + 3) >> 2) * ((height + 3) >> 2) * 16) * depth;
break;
case GL_RGBA8:
@ -451,10 +453,14 @@ static size_t GL_CalcTextureSize( GLenum format, int width, int height, int dept
size = width * height * depth * 8;
break;
case GL_RGB16F_ARB:
size = width * height * depth * 6;
break;
case GL_RGBA16F_ARB:
size = width * height * depth * 8;
break;
case GL_RGB32F_ARB:
size = width * height * depth * 12;
break;
case GL_RGBA32F_ARB:
size = width * height * depth * 16;
break;
@ -661,7 +667,11 @@ static void GL_SetTextureFormat( gl_texture_t *tex, pixformat_t format, int chan
case PF_DXT1: tex->format = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; // never use DXT1 with 1-bit alpha
case PF_DXT3: tex->format = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break;
case PF_DXT5: tex->format = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break;
case PF_ATI2: tex->format = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; break;
case PF_ATI2:
if( glConfig.hardware_type == GLHW_RADEON )
tex->format = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI;
else tex->format = GL_COMPRESSED_RED_GREEN_RGTC2_EXT;
break;
}
return;
}
@ -2046,6 +2056,7 @@ void R_TextureList_f( void )
gEngfuncs.Con_Printf( "DXT5 " );
break;
case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
gEngfuncs.Con_Printf( "ATI2 " );
break;
case GL_RGBA: