summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2018-12-03 20:00:34 +0100
committerErik Faye-Lund <[email protected]>2018-12-04 21:14:16 +0100
commit5bf38bfb64791e2021c813d069b995ed62ff7d09 (patch)
tree90cd8e3cff9dd8e8a03328133b970a67b4050c52 /src
parent4b218984d862f860e0a3b8d1bc3c3235f46871fe (diff)
mesa/main: correct validation for GL_RGB565
Technically speaking, this validation was incorrect, because GL_RGB565 is only supported in OpenGL ES 1.x if OES_framebuffer_object is supported. This couldn't lead to any real incorrect behavior, because all drivers support OES_framebuffer_object. But let's keep the code self-documenting, by correcting the check as per the spec. Signed-off-by: Erik Faye-Lund <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/glformats.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 7506c238232..ea73068d025 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2312,7 +2312,9 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
}
}
- if (_mesa_has_ARB_ES2_compatibility(ctx) || _mesa_is_gles(ctx)) {
+ if (_mesa_has_ARB_ES2_compatibility(ctx) ||
+ _mesa_has_OES_framebuffer_object(ctx) ||
+ ctx->API == API_OPENGLES2) {
switch (internalFormat) {
case GL_RGB565:
return GL_RGB;