AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,586 Commits 1 Branch 0 Tags
69a17da037d26b54e075d90c8b5ce887255291a7
Commit Graph

93586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Legg 69a17da037 ac/nir: assert printfs will fit 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
 2017-06-28 21:05:04 +02:00
James Legg 6fc41bb4d5 ac/nir: Make intrinsic_name buffer long enough 
When using cmpswap on an image, it was being trunctated to
lvm.amdgcn.image.atomic.cmpswa, with the coords type missing entirely.

v2: Add stable CC

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
 2017-06-28 21:05:04 +02:00
Chad Versace 2cde8ff545 i965/dri: Support R8G8B8A8 and R8G8B8X8 configs 
The Android framework requires support for EGLConfigs with
HAL_PIXEL_FORMAT_RGBX_8888 and HAL_PIXEL_FORMAT_RGBA_8888.

Even though all RGBX formats are disabled on gen9 by
brw_surface_formats.c, the new configs work correctly on Broxton thanks
to _mesa_format_fallback_rgbx_to_rgba().

On GLX, this creates no new configs, and therefore breaks no existing
apps. See in-patch comments for explanation. I tested with glxinfo and
glxgears on Skylake.

On Wayland, this also creates no new configs, and therfore breaks no
existing apps. (I tested with mesa-demos' eglinfo and es2gears_wayland
on Skylake). The reason differs from GLX, though. In
dri2_wl_add_configs_for_visual(), the format table contains only
B8G8R8X8, B8G8R8A8, and B5G6B5; and dri2_add_config() correctly matches
EGLConfig to format by inspecting channel masks.

On Android, in Chrome OS, I tested this on a Broxton device. I confirmed
that the Google Play Store's EGLSurface used HAL_PIXEL_FORMAT_RGBA_8888,
and that an Asteroid game's EGLSurface used HAL_PIXEL_FORMAT_RGBX_8888.
Both apps worked well. (Disclaimer: I didn't test this patch on Android
with Mesa master. I backported this patch series to an older Android
branch).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
 2017-06-28 09:42:27 -07:00
Juan A. Suarez Romero 89d4008ac8 mesa: do not use format string as literal string 
This fixes a couple of  errors when building in Android:

external/mesa3d/src/mesa/main/shaderapi.c:293:49: error: format string
is not a string literal (potentially insecure)
[-Werror,-Wformat-security]
         _mesa_error(ctx, GL_INVALID_OPERATION, caller);
                                                ^~~~~~
external/mesa3d/src/mesa/main/shaderapi.c:293:49: note: treat the string
as an argument to avoid this
         _mesa_error(ctx, GL_INVALID_OPERATION, caller);
                                                ^
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
 2017-06-28 16:19:55 +02:00
Brian Paul 7bbcf3ac70 scons: add code to generate format_fallback.c file 
Fixes: a1983223d8 "mesa: Add _mesa_format_fallback_rgbx_to_rgba() [v2]"

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
 2017-06-28 04:12:25 -06:00
Samuel Pitoiset e529ade0ea mesa: add KHR_no_error support for glClear() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 34e8d0e4ba mesa: add clear() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 48400e0bd6 mesa: add KHR_no_error support for glBindAttribLocation() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 34e5b39f37 mesa: add bind_attrib_location() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 352adb53db mesa: add KHR_no_error support for gl*ReadBuffer() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 91fcba9914 mesa: create read_buffer_err() and always inline read_buffer() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 89bc3ed7a3 mesa: add KHR_no_error support for glVertex*AttribBinding() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 401fa69132 mesa: add KHR_no_error support for glShaderStorageBlockBinding() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset edd5082861 mesa: add shader_storage_block_binding() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 6a2c1e76f2 mesa: add KHR_no_error support for glUniformBlockBinding() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 277135c1ed mesa: add uniform_block_binding() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset f543107256 mesa: add KHR_no_error support for glFenceSync() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset dd71fd1dd3 mesa: add fence_sync() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 6e0cd29132 mesa: add KHR_no_error support for glClientWaitSync() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 20ff1f9db7 mesa: add client_wait_sync() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 78d3510f0c mesa: add KHR_no_error support for glCheckFramebufferStatus() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset b87a2cbec4 mesa: add KHR_no_error support for gl*Renderbuffers() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset beb74c9b87 mesa: prepare create_render_buffers() for KHR_no_error support 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 836b48a836 mesa: add KHR_no_error support for gl*ProgramPipelines() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 89510d26a9 mesa: prepare create_program_pipelines() for KHR_no_error support 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:13 +02:00
Samuel Pitoiset 18e31bb252 mesa: add KHR_no_error support for gl*Samplers() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 455b1a3a4b mesa: prepare create_samplers() helper for KHR_no_error support 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 56f428817f mesa: add KHR_no_error support for gl*Textures() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset ab6d383e32 mesa: prepare create_textures() helper for KHR_no_error support 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 821b806d23 mesa: fix an error message in create_textures() 
Trivial.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 7c02267673 mesa: add KHR_no_error support for gl*Buffers() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 064bb7499c mesa: prepare create_buffers() helper for KHR_no_error support 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 50f9f510c9 mesa: add KHR_no_error support for glBindTextureUnit() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 81968cb748 mesa: add bind_texture_unit() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 3561d93668 mesa: add KHR_no_error support for glDepthRangeIndexed() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 9628282f1e mesa: add KHR_no_error support for glDepthFunc() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset bbc03839d1 mesa: add depth_func() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset eaa477104c mesa: add KHR_no_error support for glFrontFace() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset d77ad9da63 mesa: add front_face() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset d700ade81a mesa: add KHR_no_error support for glCullFace() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset ac92b75002 mesa: add cull_face() helper 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 03dc92ad97 mesa: add KHR_no_error support for glCreateShader() and glCreateShaderObjectARB() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset c1782e44d0 mesa: rename create_shader() to create_shader_err() 
And add a no_error variant.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 868c9c244d mesa: pass the 'caller' function to create_shader() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 8863996940 mesa: add KHR_no_error support for glAttachShader() and glAttachObjectARB() 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset f04a5b4df0 mesa: rename attach_shader() to attach_shader_err() 
And add a no_error variant.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Samuel Pitoiset 3ae7777d25 mesa: pass the 'caller' function to attach_shader() 
In order to fix GL error messages.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
 2017-06-28 10:25:12 +02:00
Ben Crocker c26be2b2e9 mapi: Enable assembly language API acceleration for PPC64LE (V2) 
Implement assembly language API acceleration for PPC64LE,
analogous to long-standing implementations for X86 and X86-64.

See also similar implementation in libglvnd.

Tested with Piglit.

Signed-off-by: Ben Crocker <bcrocker@redhat.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Bill Schmidt <wschmidt@linux.vnet.ibm.com>
 2017-06-28 08:20:45 +01:00
Chad Versace 74db56b97a i965: Add a RGBX->RGBA fallback for glEGLImageTextureTarget2D() 
This enables support for importing RGBX8888 EGLImage textures on
Skylake.

Chrome OS needs support for RGBX8888 EGLImage textures because because
the Android framework produces HAL_PIXEL_FORMAT_RGBX8888 winsys
surfaces, which the Chrome OS compositor consumes as dma_bufs.  On
hardware for which RGBX is unsupported or disabled, normally core Mesa
provides the RGBX->RGBA fallback during glTexStorage.  But the DRIimage
code bypasses core Mesa, so we must do the fallback in i965.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
 2017-06-27 16:56:30 -07:00
Chad Versace a1983223d8 mesa: Add _mesa_format_fallback_rgbx_to_rgba() [v2] 
The new function takes a mesa_format and, if the format is an alpha
format with a non-alpha variant, returns the non-alpha format.
Otherwise, it returns the original format.

Example:
  input -> output

  // Fallback exists
  MESA_FORMAT_R8G8B8X8_UNORM -> MESA_FORMAT_R8G8B8A8_UNORM
  MESA_FORMAT_RGBX_UNORM16 -> MESA_FORMAT_RGBA_UNORM16

  // No fallback
  MESA_FORMAT_R8G8B8A8_UNORM -> MESA_FORMAT_R8G8B8A8_UNORM
  MESA_FORMAT_Z_FLOAT32 -> MESA_FORMAT_Z_FLOAT32

i965 will use this for EGLImages and DRIimages.

v2 (Jason Ekstrand):
 - Use mako
 - Rework to be easier to read
 - Write directly to the output file

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
 2017-06-27 16:56:28 -07:00