ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenGL2: Remove check for GL_ARB_texture_non_power_of_two.

Browse source 
Core in OpenGL 2.0.
This commit is contained in:
SmileTheory 2016-10-21 16:58:42 -07:00
parent 41ae7815c9
commit ba59df8c8c
3 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/renderergl2/tr_extensions.c
View file

@ -138,20 +138,6 @@ void GLimp_InitExtraExtensions()
ri.Printf(PRINT_ALL, result[2], extension); ri.Printf(PRINT_ALL, result[2], extension);
} }
// GL_ARB_texture_non_power_of_two
extension = "GL_ARB_texture_non_power_of_two";
glRefConfig.textureNonPowerOfTwo = qfalse;
if( GLimp_HaveExtension( extension ) )
{
glRefConfig.textureNonPowerOfTwo = qtrue; // !!r_ext_texture_non_power_of_two->integer
ri.Printf(PRINT_ALL, result[glRefConfig.textureNonPowerOfTwo], extension);
}
else
{
ri.Printf(PRINT_ALL, result[2], extension);
}
// GL_ARB_texture_float // GL_ARB_texture_float
extension = "GL_ARB_texture_float"; extension = "GL_ARB_texture_float";
glRefConfig.textureFloat = qfalse; glRefConfig.textureFloat = qfalse;

14
code/renderergl2/tr_image.c
View file

@ -1492,7 +1492,7 @@ static qboolean RawImage_ScaleToPower2( byte **data, int *inout_width, int *inou
// //
// convert to exact power of 2 sizes // convert to exact power of 2 sizes
// //
if (glRefConfig.textureNonPowerOfTwo && !mipmap) if (!mipmap)
{ {
scaled_width = width; scaled_width = width;
scaled_height = height; scaled_height = height;
@ -2749,16 +2749,8 @@ void R_CreateBuiltinImages( void ) {
{ {
int width, height, hdrFormat, rgbFormat; int width, height, hdrFormat, rgbFormat;
if(glRefConfig.textureNonPowerOfTwo) width = glConfig.vidWidth;
{ height = glConfig.vidHeight;
width = glConfig.vidWidth;
height = glConfig.vidHeight;
}
else
{
width = NextPowerOfTwo(glConfig.vidWidth);
height = NextPowerOfTwo(glConfig.vidHeight);
}
hdrFormat = GL_RGBA8; hdrFormat = GL_RGBA8;
if (r_hdr->integer && glRefConfig.framebufferObject && glRefConfig.textureFloat) if (r_hdr->integer && glRefConfig.framebufferObject && glRefConfig.textureFloat)

1
code/renderergl2/tr_local.h
View file

@ -1386,7 +1386,6 @@ typedef struct {
int maxRenderbufferSize; int maxRenderbufferSize;
int maxColorAttachments; int maxColorAttachments;
qboolean textureNonPowerOfTwo;
qboolean textureFloat; qboolean textureFloat;
textureCompressionRef_t textureCompression; textureCompressionRef_t textureCompression;
qboolean swizzleNormalmap; qboolean swizzleNormalmap;