Change-Id: Ic1be4174ae56f7afb8362577d137aaf48d0c0d1e

Change-Id: I8d01c42ff10c518cca7ac6e89f0cc67fe2fca004

Change-Id: Ifa6ea9b04a4a9b1d495aaf4d7ec6f18ef1545258

am: 1fcaef12 -s ours
am skip reason: subject contains skip directive

Change-Id: I95926af526de5f11bb1afd3e573f90167b360c79

Bug: 120848293
Change-Id: I7ce8a298ccae4d818f635fee491ecea60de46708

Change-Id: I06a43e35f70c8a8d5fa8615d758b68829b8565d8

Change-Id: If8270089b07e0e2b344a7552bc4ab471f3779845

Change-Id: Ide7ff4ab8d1cfc6f83782919cc349bcfbfbe62eb

am: 7ff42925

Change-Id: Ia8e70c6ee7c38afd963af30fc55795cfc0543c7c

am: 123d3d8d

Change-Id: I5116285f94300f71de85f69af5ce2603a1f85fd7

am: c09b36ef

Change-Id: Ieffc22b5daed56d899f1b650d68aacba4f51b7e3

Bug: 33166666
Test: gerrit uploader
Change-Id: I7772e14f2693109f91c193e03b420eec4070b55b

Change-Id: I025c85bc9c40612ba22461128eccda97233877d5

Change-Id: Iec3733d04ff6cf7d2da7f4e381d456359fec2ed4

am: df89229b

Change-Id: I892eee72a59fd5dc1ceeffaa92bb4e87ab9f5eb0

am: 68429e8e

Change-Id: Ia23b6d30024e2cebdb1b2717800f7657fcbc2a5f

am: af703680

Change-Id: I81d991ba8c0333882446401247837905838f5bd3

BUG: 117514054
Test: TH
Change-Id: I6c026085793b87fe28f8139985491b691a1d3f83

BUG: 117514054
Test: TH
Change-Id: I6c026085793b87fe28f8139985491b691a1d3f83

Change-Id: Ie5689a72cd05de2a00b4a9a2ef8f0932734d4314

BUG: 117514054
Test: TH
Change-Id: Ib662b73750e924244e572cc39afe2546f229e23b

BUG: 77276633
Test: Built in local tree
Change-Id: I6f9ecce5a1a8750ee1d4dfb79a04b61ff8cbde01

Bug: 111504385
Change-Id: I29408413750f50bf1cdc05a3e50aa87c754a0808

Bug: 111504385
Change-Id: I9f774a9949ef164385ac1aa38a75bdb2b447556c
Signed-off-by: Alistair Strachan <astrachan@google.com>

This way we can report the actual max texture, rather than a
conservative guess like we do now.

Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Signed-off-by: Jakob Bornecrantz <jakob@collabora.com>

This reverts commit 3e7a6ac4.

This broke piglit ./bin/arb_shader_image_load_store-semantics

Closes: #19

Fixes:
  dEQP-GLES31.functional.geometry_shading.basic.point_size

  dEQP-GLES31.functional.primitive_bounding_box.wide_points.
    global_state.vertex_geometry_fragment.
      default_framebuffer_bbox_equal
      default_framebuffer_bbox_larger
      default_framebuffer_bbox_smaller
      fbo_bbox_equal
      fbo_bbox_larger
      fbo_bbox_smaller
    tessellation_set_per_draw.vertex_tessellation_geometry_fragment.
      default_framebuffer_bbox_equal
      default_framebuffer_bbox_larger
      default_framebuffer_bbox_smaller
      fbo_bbox_equal
      fbo_bbox_larger
      fbo_bbox_smaller
    tessellation_set_per_primitive.vertex_tessellation_geometry_fragment.default_framebuffer
    tessellation_set_per_primitive.vertex_tessellation_geometry_fragment.fbo

  dEQP-GLES31.functional.tessellation_geometry_interaction.point_size.
     geometry_set
     vertex_set_geometry_set
     vertex_set_evaluation_set_geometry_set
     vertex_set_control_pass_eval_add_geometry_add

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

The vertex shader always gl_PerVertex, but the tesselation shaders only
define the structure when the point size extension is enabled, otherwise
gl_PointSize is passed as a generic varying and can not be written to.

If one enables the extension based on whether the value gl_PointSize is
actually accessed in the tess shaders then it might happend that tess_ctrl
doesn't touch the value, and the extension isn't enabled, and tess_eval
accesses it and the extension is enabled. In such a case gl_PointSize is
passed as a generic to and from the tess_ctrl shader and linking of the
shaders will fail because of different definitions of gl_PerVertex.

Since in this case there is no indication in the tess_ctrl shader that
point_size is accessed, and it is not known whether the shader will be
linked with a tess_eval shader that uses gl_PointSize the workaround is to
always enable the extension for all tesselation shaders.

Fixes:
  dEQP-GLES31.functional.tessellation_geometry_interaction.
    point_size.evaluation_set
    point_size.vertex_set_control_set
    point_size.vertex_set_evaluation_set
    point_size.vertex_set_evaluation_set_geometry_default

  dEQP-GLES31.functional.primitive_bounding_box.wide_points.
    global_state.vertex_tessellation_fragment.
      default_framebuffer_bbox_equal
      default_framebuffer_bbox_larger
      default_framebuffer_bbox_smaller
      fbo_bbox_equal
      fbo_bbox_larger
      fbo_bbox_smaller

  dEQP-GLES31.functional.primitive_bounding_box.wide_points.
    tessellation_set_per_draw.vertex_tessellation_fragment.
      default_framebuffer_bbox_equal
      default_framebuffer_bbox_equal
      default_framebuffer_bbox_larger
      default_framebuffer_bbox_smaller
      fbo_bbox_equal
      fbo_bbox_larger
      fbo_bbox_smaller
    tessellation_set_per_primitive.vertex_tessellation_fragment.
      default_framebuffer
      fragment.fbo

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

GLES 3.1 might support tesselation shaders through the extension, but
this requires the extension to be enabled manually.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

Closes: #16

Fixes:
  dEQP-GLES31.functional.image_load_store.*.format_reinterpret.*
  dEQP-GLES31.functional.image_load_store.*.image_size.writeonly_*
  dEQP-GLES31.functional.image_load_store.*.load_store.*
  dEQP-GLES31.functional.image_load_store.*.qualifiers.restrict
  dEQP-GLES31.functional.image_load_store.*.store.*

v2: remove superfluous check (Erik)

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

Closes: #18

Fixes:
  dEQP-
GLES31.functional.geometry_shading.layered.fragment_layer_2d_array
  dEQP-
GLES31.functional.geometry_shading.layered.fragment_layer_2d_multisample_array
  dEQP-GLES31.functional.geometry_shading.layered.fragment_layer_3d
  dEQP-GLES31.functional.geometry_shading.layered.fragment_layer_cubemap

Reviewed-by: Jakob Bornecrantz <jakob@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

(i|u)mulextended require that the all parameters are of the same
signedness. Accordingly create both, the output variabale for MSB and
the (unused) variable for the LSB to be of the same corresponding
signedness. Closes: #17

Fixes:
  dEQP-
GLES31.functional.shaders.builtin_functions.integer.imulextended.*

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

Certain source regs (GRID_SIZE, THREAD_ID, BLOCK_ID) don't need
to be cast.

Fixes:
  dEQP-GLES31.functional.compute.basic.image_atomic_op_local_size_1
  dEQP-GLES31.functional.compute.basic.image_atomic_op_local_size_8
  dEQP-GLES31.functional.compute.basic.image_barrier_multiple

Reviewed-By: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

findLSB, findMSB, and countBits always return a signed integer

Fixes:

    dEQP-GLES31.functional.shaders.builtin_functions.uniform.findLSBMinusOne.*
    dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.*
    dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.*

    Changes resulting from the discussion on mesa-dev with
    Roland Schneidegger:
    v2: Set values in infer_(src|dst)_type only
    v3: Set values in the common infer_type code path, and only add
        the source type for UMSB

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

Fixes:
tests/spec/arb_gpu_shader5/execution/ubo_array_indexing/vs-mixed-with-const-access.shader_test

Tested-by: Jakob Bornecrantz <jakob@collabora.com>
Reviewed-by: Jakob Bornecrantz <jakob@collabora.com>
Signed-off-by: Jakob Bornecrantz <jakob@collabora.com>

We didn't correctly reject textures that would fail glTexImage2D with an
GL_INVALID_OPERATION error. Trying to use the so accepted texture formats would later
lead to errors.

Correct this error and also the definition of VIRGL_FORMAT_X24S8_UINT that is needed
for GLES 3.1.

Closes: #15

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Jakob Bornecrantz <jakob@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

921602de
shader: refactor image declaration emitting

broke indirect images.

When using OpenGL ES 3.1, we either need to emit a precision qualifier,
or set a default precision.

Since it's not unthinkable that we'd want to forward lowp/mediump
in the future, let's use the precision qualifier so it's easier
to get this right later on.

This gets rid of a shader compile error.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

OpenGL ES 3.1 only supports writing to a few formats, while it can
read from all of them. So let's make sure we emit readonly, so the
OpenGL driver knows we'll only read.

This avoids a shader-compiler error on OpenGL ES 3.1.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

OpenGL ES 3.1 doesn't support using glUniform1i() for binding
images, so let's use layout qualifiers instead. This should in
theory be slightly more performant as well, as we do less API
calls.

A future improvement would be to also do this on GL 4.2 and later
as well.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>