ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-12 15:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take advantage of GL_ARB_texture_non_power_of_two when it's available

Browse source
This commit is contained in:
Sam Lantinga 2014-08-14 21:31:50 -07:00
parent 2c1faa40eb
commit c6a2382c66
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/render/opengl/SDL_render_gl.c
View file

@ -121,6 +121,7 @@ typedef struct
GLDEBUGPROCARB next_error_callback; GLDEBUGPROCARB next_error_callback;
GLvoid *next_error_userparam; GLvoid *next_error_userparam;
SDL_bool GL_ARB_texture_non_power_of_two_supported;
SDL_bool GL_ARB_texture_rectangle_supported; SDL_bool GL_ARB_texture_rectangle_supported;
struct { struct {
GL_Shader shader; GL_Shader shader;
@ -499,9 +500,13 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
data->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB); data->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
} }
if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle") if (SDL_GL_ExtensionSupported("GL_ARB_texture_non_power_of_two")) {
|| SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) { data->GL_ARB_texture_non_power_of_two_supported = SDL_TRUE;
} else if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle") ||
SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) {
data->GL_ARB_texture_rectangle_supported = SDL_TRUE; data->GL_ARB_texture_rectangle_supported = SDL_TRUE;
}
if (data->GL_ARB_texture_rectangle_supported) {
data->glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB, &value); data->glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB, &value);
renderer->info.max_texture_width = value; renderer->info.max_texture_width = value;
renderer->info.max_texture_height = value; renderer->info.max_texture_height = value;
@ -697,7 +702,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
GL_CheckError("", renderer); GL_CheckError("", renderer);
renderdata->glGenTextures(1, &data->texture); renderdata->glGenTextures(1, &data->texture);
if (GL_CheckError("glGenTexures()", renderer) < 0) { if (GL_CheckError("glGenTextures()", renderer) < 0) {
if (data->pixels) { if (data->pixels) {
SDL_free(data->pixels); SDL_free(data->pixels);
} }
@ -706,8 +711,13 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} }
texture->driverdata = data; texture->driverdata = data;
if ((renderdata->GL_ARB_texture_rectangle_supported) if (renderdata->GL_ARB_texture_non_power_of_two_supported) {
/* && texture->access != SDL_TEXTUREACCESS_TARGET */){ data->type = GL_TEXTURE_2D;
texture_w = texture->w;
texture_h = texture->h;
data->texw = 1.0f;
data->texh = 1.0f;
} else if (renderdata->GL_ARB_texture_rectangle_supported) {
data->type = GL_TEXTURE_RECTANGLE_ARB; data->type = GL_TEXTURE_RECTANGLE_ARB;
texture_w = texture->w; texture_w = texture->w;
texture_h = texture->h; texture_h = texture->h;

5
src/render/opengl/SDL_shaders_gl.c
View file

@ -376,8 +376,9 @@ GL_CreateShaderContext()
return NULL; return NULL;
} }
if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle") if (!SDL_GL_ExtensionSupported("GL_ARB_texture_non_power_of_two") &&
|| SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) { (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle") ||
SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle"))) {
ctx->GL_ARB_texture_rectangle_supported = SDL_TRUE; ctx->GL_ARB_texture_rectangle_supported = SDL_TRUE;
} }