From: Francisco Jerez <currojerez@riseup.net>
Date: Sun, 16 Aug 2015 23:01:40 +0000 (+0300)
Subject: mesa: Initialize image unit state to different defaults in GLES.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d70edfcfd53b50da0c4bb7aad909302dca6d4722;p=mesa.git

mesa: Initialize image unit state to different defaults in GLES.

There is no GL_R8 image format in GLES, according to the state table
20.32 of the GLES 3.1 spec the default value should be GL_R32UI.  The
ES31-CTS.shader_image_load_store.basic-api-bind Khronos conformance
test checks that this is the case.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/shaderimage.c b/src/mesa/main/shaderimage.c
index 48e3e09dd5d..5a3c47a62c8 100644
--- a/src/mesa/main/shaderimage.c
+++ b/src/mesa/main/shaderimage.c
@@ -397,10 +397,11 @@ is_image_format_supported(const struct gl_context *ctx, GLenum format)
 struct gl_image_unit
 _mesa_default_image_unit(struct gl_context *ctx)
 {
+   const GLenum format = _mesa_is_desktop_gl(ctx) ? GL_R8 : GL_R32UI;
    const struct gl_image_unit u = {
       .Access = GL_READ_ONLY,
-      .Format = GL_R8,
-      ._ActualFormat = _mesa_get_shader_image_format(GL_R8)
+      .Format = format,
+      ._ActualFormat = _mesa_get_shader_image_format(format)
    };
    return u;
 }