diff options
author | Jason Ekstrand <[email protected]> | 2015-10-07 15:52:09 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2015-10-07 20:32:53 -0700 |
commit | 6ad9ebb073fc4ed245ef8e9db4479a52e818cb92 (patch) | |
tree | 1fbb5dfa28d70676f3274cd632be938dd2af8cd0 /src/glsl | |
parent | bbf728f11b45121bf2d03b61bc0ffc69e0ff0836 (diff) |
mesa: Correctly handle GL_BGRA_EXT in ES3 format_and_type checks
The EXT_texture_format_BGRA8888 extension (which mesa supports
unconditionally) adds a new format and internal format called GL_BGRA_EXT.
Previously, this was not really handled at all in
_mesa_ex3_error_check_format_and_type. When the checks were tightened in
commit f15a7f3c, we accidentally tightened things too far and GL_BGRA_EXT
would always cause an error to be thrown.
There were two primary issues here. First, is that
_mesa_es3_effective_internal_format_for_format_and_type didn't handle the
GL_BGRA_EXT format. Second is that it blindly uses _mesa_base_tex_format
which returns GL_RGBA for GL_BGRA_EXT. This commit fixes both of these
issues as well as adds explicit checks that GL_BGRA_EXT is only ever used
with GL_BGRA_EXT and GL_UNSIGNED_BYTE.
Signed-off-by: Jason Ekstrand <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92265
Reviewed-by: Ian Romanick <[email protected]>
Cc: "11.0" <[email protected]>
Diffstat (limited to 'src/glsl')
0 files changed, 0 insertions, 0 deletions