OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,911 Commits 9 Branches 1 Tag
f79525dda6fa288514f0a2ac63fbd4b8b87c7067
Commit Graph

157911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Axel Davy
5c4028ac36 frontend/nine: Fix ATOC handling 
The previous code was incorrectly checking the previous
value of alphatestenable.
In addition, remove an optimization that cannot hit (as we
filter out redundant state settings).

cc: mesa-stable

Fixes: 1272640d5 ("st/nine: Fix alpha to coverage states")
Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18021>
(cherry picked from commit 4f953ad512)
 2022-08-16 09:39:14 -07:00
Axel Davy
53cd211cb9 frontend/nine: Fix buffer tracking out of bounds 
Fixes a crash in a ffxi trace, which draws out of bounds.
This was previously resulting in trying to fill a buffer
resource not big enough.

cc: mesa-stable
Fixes: 380c2bf ("st/nine: Optimize dynamic systemmem buffers")

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18021>
(cherry picked from commit e5124e83ba)
 2022-08-16 09:39:13 -07:00
Axel Davy
bdcffd60db frontend/nine: Skip invalid swvp calls 
Without this it may crash running wine tests.
According to the test themselves, the correct
behaviour is a bit more complicated, but
that's a first step.

cc: mesa-stable

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18021>
(cherry picked from commit b74febffe6)
 2022-08-16 09:39:13 -07:00
Yonggang Luo
b712253b53 util: Fixes invalid assumption that return non null by function util_format_fetch_rgba_func 
Fixes: e342081c ("util/format: Assert that formats are valid")
Closes #7020

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18024>
(cherry picked from commit 075b72ea06)
 2022-08-16 09:39:11 -07:00
pal1000
ecc41f91ad meson: Microsoft / maybe Intel CLC need the all-targets workaround 
just like clover

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5666
Fixes: 1506ea2ecb ("Move a bunch of the CLC stuff from src/microsoft to common code")

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17682>
(cherry picked from commit b5b855149c)
 2022-08-16 09:38:48 -07:00
Dylan Baker
f1a407de47 .pick_status.json: Update to 74fc367127 2022-08-16 09:38:46 -07:00
Konstantin Seurer
9998f8e1db radv: Fix stack size calculation with stage ids 
In create_rt_shader, we were setting group_idx to the stage index before.

Fixes the following tests:

dEQP-VK.ray_query.builtin.instancecustomindex.miss.aabbs
dEQP-VK.ray_query.builtin.objectrayorigin.miss.triangles

Fixes: c39ccce ("radv/rt: use stage ID as handle for general and closestHit shaders")
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17936>
(cherry picked from commit 2d39227a90)
 2022-08-12 10:42:23 -07:00
Samuel Pitoiset
26c1926a4a radv: fix cleaning the meta query state if an error occured 
It's already correctly cleaned in radv_device_init_meta().

This fixes a recent regression with
dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.

Fixes: 1a95d43e55 ("radv: Simplify the meta init fail path")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17952>
(cherry picked from commit 37dfa4e3f3)

Conflicts:
	src/amd/ci/radv-hawaii-aco-fails.txt
	src/amd/ci/radv-oland-aco-fails.txt

Stable:
    - remove CI files that don't exist in 22.2
 2022-08-12 10:42:23 -07:00
Mike Blumenkrantz
9a43a1f1d1 mesa: require render target bind for A/L/I in format selection 
these are required framebuffer formats in certain versions of GL,
so don't create a texture that can't later be bound to a framebuffer

see also spec@!opengl 3.0@required-texture-attachment-formats

cc: mesa-stable

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17687>
(cherry picked from commit 28d033b34f)
 2022-08-12 10:42:23 -07:00
Mike Blumenkrantz
b3fc8cb419 mesa: fix blending when using luminance/intensity emulation 
neither of these have a real alpha channel, so reuse the xrgb blend
clamping here to ensure the "right" alpha value is used

cc: mesa-stable

fixes:
spec@arb_texture_float@fbo-blending-formats

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17687>
(cherry picked from commit 4f28e2827c)
 2022-08-12 10:42:23 -07:00
sjfricke
9f305dd4e6 isl: fix bug where sb.MOCS is not being set 
Currently the sb.MOCS is being reset to zero after struct init.

Signed-off-by: sjfricke <spencerfricke@gmail.com>
Fixes: c27fcb1d3b ("isl: Fill in MOCS for NULL depth, stencil, and HiZ buffers.")
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17985>
(cherry picked from commit 861167f41d)
 2022-08-12 09:41:33 -07:00
Marek Olšák
dbc956920f glthread: call _mesa_glthread_DeleteBuffers unconditionally 
Deleted buffers were not unbound in glthread.

Fixes: 4fa24747b9 - glthread: call _mesa_glthread_BindBuffer unconditionally

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17976>
(cherry picked from commit 28e351673e)
 2022-08-12 09:41:33 -07:00
Marek Olšák
fa4c949150 glthread: unbind framebuffers in glDeleteFramebuffers 
Tests:
    dEQP-GLES2.functional.lifetime.delete_bound.framebuffer
    dEQP-GLES2.functional.state_query.integers.framebuffer_binding_getinteger

Fixes: e48f676835 - glthread: don't sync for more glGetIntegerv enums for glretrace

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17976>
(cherry picked from commit eb4036ea5b)
 2022-08-12 09:41:33 -07:00
Charmaine Lee
3490712ad7 mesa/st: fix reference to nir->info after nir_to_tgsi 
The nir shader memory is freed in nir_to_tgsi(), but the already
freed shader info is referenced later when create compute state.
To avoid referencing the freed memory, copy the shader info first before
calling nir_to_tgsi.

Fixes vmx crash running aztec on SVGA driver.
Fixes: 580f1ac473 ("nir: Extract shader_info->cs.shared_size out of union")

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17999>
(cherry picked from commit 4393be8291)
 2022-08-12 09:41:33 -07:00
Dylan Baker
260b7902fe .pick_status.json: Update to 24b9ad7cd5 2022-08-12 09:41:29 -07:00
Yonggang Luo
12f1cabeba microsoft/clc: Fixes compiling errors with clang/mingw64 in clc/clc_compiler_test.cpp 
clc_compiler_test.cpp:1322:67: error: non-constant-expression cannot be narrowed from type 'double' to 'float' in initializer list
      log(0.0f) / log(2), log(1.0f) / log(2), log(2.0f) / log(2), log(3.0f) / log(2)
clc_compiler_test.cpp:2306:25: error: non-constant-expression cannot be narrowed from type 'std::vector<unsigned int>::size_type' (aka 'unsigned long long') to 'unsigned int' in initializer list
   CompileArgs args = { inout.size(), 1, 1 };

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
(cherry picked from commit ecfda9a0fa)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18030>
 2022-08-12 12:40:53 +03:00
Lionel Landwerlin
4e0637a182 anv: don't return incorrect error code for vkCreateDescriptorPool 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7013
Cc: mesa-stable
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17945>
(cherry picked from commit 56bb29cb93)
 2022-08-11 10:33:26 -07:00
Jesse Natalie
8b0343601c egl/wgl: Fix some awkward sizeof formatting 
Fixes: 3415bf02 ("egl: Add a basic Windows driver")
Suggested-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Sidney Just <justsid@x-plane.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12964>
(cherry picked from commit 17eda68df3)
 2022-08-11 10:33:25 -07:00
Jesse Natalie
bac7da0264 egl/wgl: Delete unused variables/code 
Fixes: 3415bf02 ("egl: Add a basic Windows driver")
Suggested-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Sidney Just <justsid@x-plane.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Tested-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12964>
(cherry picked from commit efd2ae6c0c)
 2022-08-11 10:33:25 -07:00
Mike Blumenkrantz
b01498700c nir/validate: clamp unsized tex dests to 32bit 
this is the "default" size that's expected

cc: mesa-stable

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17874>
(cherry picked from commit b7eda568a4)
 2022-08-11 10:33:24 -07:00
Mike Blumenkrantz
1c6c94424b radv: fix return type for meta resolve shaders 
this should match the image type

cc: mesa-stable

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17874>
(cherry picked from commit 632e1b66f5)
 2022-08-11 10:33:23 -07:00
Dylan Baker
87e006ca01 .pick_status.json: Update to a3bf0da1cb 2022-08-11 10:33:20 -07:00
Chia-I Wu
f88ce98ee6 turnip: use SPDX-License-Identifier 
(cherry picked from commit f0558c6f1c)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
ffc5316a7c turnip: remove headers from libtu_files 
meson can work out the dependencies.

(cherry picked from commit 8977913a23)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
5433fb705b turnip: remove tu_private.h 
(cherry picked from commit 381f234ab8)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
773964fb8b turnip: move away from tu_private.h 
(cherry picked from commit 5f7538f241)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
75af03a653 turnip: update tu_util.h 
(cherry picked from commit 46baf86414)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
61790c60dd turnip: add tu_android.h 
(cherry picked from commit e99703b515)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
6094318c4d turnip: add tu_cmd_buffer.h 
(cherry picked from commit 8e61bee30c)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
6225807c85 turnip: add tu_device.h 
Also drop unused

 - tu_instance_extension_supported
 - tu_physical_device_api_version
 - tu_physical_device_extension_supported
 - tu_device_submit_deferred_locked
 - tu_get_perftest_option_name

(cherry picked from commit 6666ec3945)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
df69376e68 turnip: update tu_autotune.h 
(cherry picked from commit 9d9bf78565)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
7c6e24f329 turnip: add tu_wsi.h 
Also drop unused x11 and wayland type definitions.

(cherry picked from commit 4fc31e4af3)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
c69f749bd8 turnip: add tu_pass.h 
(cherry picked from commit 543fac108d)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
42cd6b0fa0 turnip: add tu_lrz.h 
(cherry picked from commit 3c607309c9)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
0d27e5fd63 turnip: add tu_dynamic_rendering.h 
(cherry picked from commit 79dd12478f)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
a4a7aa5d1a turnip: add tu_clear_blit.h 
Also drop unused tu_emit_load_gmem_attachment.

(cherry picked from commit 4f759fddba)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
a77322c414 turnip: add tu_pipeline.h 
Also drop unused tu_pipeline_key.

(cherry picked from commit 6430efcab7)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
3b82f4eae2 turnip: add tu_shader.h 
(cherry picked from commit ec5bc3d8ff)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
d214aa3889 turnip: update tu_descriptor_set.h 
Also drop unused tu_descriptor_range.

(cherry picked from commit a7fe90434c)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:16 -07:00
Chia-I Wu
9b266113fe turnip: add tu_formats.h 
(cherry picked from commit 216f19e62f)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
96df57ad5d turnip: add tu_image.h 
(cherry picked from commit 095dfcae45)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
9d3c4ea4ec turnip: add tu_query.h 
(cherry picked from commit 65a5fbcb15)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
853962d850 turnip: update tu_cs.h 
(cherry picked from commit 51d416a7e4)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
c10a10b3ac turnip: add tu_suballoc.h 
(cherry picked from commit 2e337f05ab)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
fe4bc64b9f turnip: add tu_drm.h 
Also define tu_syncobj_from_handle only when TU_USE_KGSL.

(cherry picked from commit 4d9ac3d0df)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
1a1ded7d78 turnip: remove includes that are already in tu_common.h 
(cherry picked from commit 120469efea)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Chia-I Wu
e2ff62782d turnip: add tu_common.h as the common header 
Move most includes and defines in tu_private.h to the new tu_common.h.

tu_common.h is a header that all other files include, mostly indirectly
through tu_private.h.  The only exceptions are tu_perfetto.h and
tu_tracepoints.h, because ir3 headers are not compatible with C++.

(cherry picked from commit 0312157101)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
 2022-08-10 13:30:15 -07:00
Dylan Baker
df035d2894 VERSION: bump to 22.2.0-rc2 2022-08-10 12:17:09 -07:00
Dylan Baker
23daa993df Revert "VERSION: update to 22.2.0" 
This reverts commit bc9e9c39ef.

Buggy script created a buggy patch. Sorry for the commotion
 2022-08-10 12:13:04 -07:00
Dylan Baker
bc9e9c39ef VERSION: update to 22.2.0 2022-08-10 11:00:49 -07:00