summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-09-27 15:24:31 +0200
committerNicolai Hähnle <[email protected]>2017-10-02 15:07:43 +0200
commitf38b94285db7c0630b16cf6b8abc80e973e2e09f (patch)
tree132eb7df2dedad6591d4dc20890c436d8d00ea66 /src/mesa
parentfcae1a64ec0ef96bf90e473893849213ab9c14dd (diff)
mesa/main: select the R10G10B10X2_UNORM internal format based on data type
ES requires it. This is a partial fix for dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb_unsigned_int_2_10_10_10_rev Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/formats.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 5c29d37bb44..ecdfd561035 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -2005,7 +2005,6 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
case MESA_FORMAT_RGBX_UINT8:
case MESA_FORMAT_RGBX_SINT8:
case MESA_FORMAT_B10G10R10X2_UNORM:
- case MESA_FORMAT_R10G10B10X2_UNORM:
case MESA_FORMAT_RGBX_UNORM16:
case MESA_FORMAT_RGBX_SNORM16:
case MESA_FORMAT_RGBX_FLOAT16:
@@ -2016,6 +2015,9 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
case MESA_FORMAT_RGBX_SINT32:
return GL_FALSE;
+ case MESA_FORMAT_R10G10B10X2_UNORM:
+ return format == GL_RGB && type == GL_UNSIGNED_INT_2_10_10_10_REV &&
+ !swapBytes;
case MESA_FORMAT_R10G10B10A2_UNORM:
return format == GL_RGBA && type == GL_UNSIGNED_INT_2_10_10_10_REV &&
!swapBytes;