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

139099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Jackson
ceba7f6952 i915c: Add a symlink for i830_dri.so 
The gallium driver doesn't support gen2, so let's make it possible to
keep both i915g and i830 drivers installed in parallel.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10554>
 2021-05-03 23:03:09 +00:00
Adam Jackson
61b7e6578a include: Remove unused i810_pci_ids.h 
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10554>
 2021-05-03 23:03:09 +00:00
Antonio Caggiano
1b87a7d5e0 panfrost: Meson dependency 
Declare a meson dependency for libpanfrost and wrap some key functions
within an extern C block allowing proper compilation by C++ compilers.

Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10462>
 2021-05-03 21:08:47 +00:00
Chia-I Wu
390722620e venus: clean up vn_device_fix_create_info 
The extension list should be more correct now.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
9171b981bf venus: add extension check for ANDROID_native_buffer 
We only do it on Android for now, to keep the driver working with older
renderers on X11.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
203e64eadd venus: init supported extensions in one place 
This also guarantees that physical_dev->extension_spec_versions[X] is
set when extension X is supported.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
dc73489a38 venus: refactor vn_physical_device_init_supported_extensions 
Native extensions are those do not require direct renderer support.
Passthrough extensions are those require direct renderer support.

Native extensions usually require translation to other extensions that
the renderer supports.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
c44225c20b venus: avoid strcmp for spec version override 
Add VN_EXTENSION_TABLE_INDEX for use with VK_ANDROID_native_buffer spec
version override.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
14ce47e04a venus: refactor vn_physical_device_init_extensions 
Split up into two functions, one initializes the renderer extension
table and one initializes the supported extension table.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
d69f7b3e6a venus: clarify/fix device renderer version 
Mostly docs and cleanups, except that renderer_version is now also
capped by the xml version.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
7f7742998e venus: clarify/fix instance renderer versions 
Add vn_instance::renderer_version to indicate the maximum renderer
instance version we can use internally.  It is not all that useful
because we only use 1.1 instance features and VN_MIN_RENDERER_VERSION is
set to 1.1, but whatever.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
7a0b0dd931 venus: rename vn_instance::renderer_version 
Rename renderer_version to renderer_api_version.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:46 +00:00
Chia-I Wu
773e318569 venus: add VN_MAX_API_VERSION 
Use VN_MAX_API_VERSION for the instance version such that we don't
suddenly advertise 1.3 when the header is updated to 1.3 for example.

Use it to cap the device version as well.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
 2021-05-03 20:51:45 +00:00
Chia-I Wu
38e0067643 venus: fix dmabuf import fail path 
When we fail, we should not close gem_handle when there is already a bo
with the same gem handle.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10592>
 2021-05-03 20:40:14 +00:00
Chia-I Wu
40fbfd8b5b venus: fix dmabuf import mmap_size check 
Do not set mmap_size to info.size.  We do not track the size of the BO
anymore.

This fixes
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.fd_properties
where the test allocates a 1KB VkDeviceMemory, export and call
vkGetMemoryFdPropertiesKHR.  It can happen that bo->mmap_size is less
than the aligned info.size.

FWIW, the test fails because it violates a VU:

  VUID-vkGetMemoryFdPropertiesKHR-fd-00673
  fd must be an external memory handle created outside of the Vulkan API

Fixes: 88f481dd74 ("venus: make sure gem_handle and vn_renderer_bo are 1:1")
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10592>
 2021-05-03 20:40:14 +00:00
Chia-I Wu
a9a75edc24 venus: fix render pass without attachments 
It was treated as VK_ERROR_OUT_OF_HOST_MEMORY because
vn_get_intercepted_attachments would return NULL.  This fixes various
dEQP tests.

Fixes: 174fca5498 ("venus: handle VK_IMAGE_LAYOUT_PRESENT_SRC_KHR transfer")
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10592>
 2021-05-03 20:40:14 +00:00
Connor Abbott
9fa587ae96 ir3: Don't assume regs[1] exists in ir3_fixup_src_type() 
It won't exist for phi nodes because they are only partially constructed
beforehand. Move it into the switch arguments where we know it's needed.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
3c8a5d7e17 ir3: Rework outputs 
Instead of using a separate outputs array, make the "end" instruction
(or chmask) take the outputs as sources. This works better for the new
RA, because it better models the fact that outputs are consumed all at
the same time. With the old model, each output collect would be assumed
dead after it was processed and subsequent collects could use it when
inserting shuffle code, which wouldn't work, and the new RA also deletes
collect instructions after lowering them to moves so the information
would be gone after RA.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
dd55bd8f68 ir3: Make predecessors an array 
We need a stable order in order to create phi instructions. In the
future we can make this more sophisticated in order to make manipulating
the CFG easier, but for now that only happens after RA, so we won't have
to worry about it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
0bd68b8386 ir3: Refactor nir->ir3 block handling 
Originally I wrote this to support multiple ir3 blocks per NIR block,
but this turned out to be more useful for creating a stable ordering to
the predecessors. We compute the predecessors ourselves, rather than
relying on NIR, so that the array of predecessors we create in the next
commit has a stable order we can rely on when creating phi nodes.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
d28b22374c ir3/cp_postsched: Fixup SSA use pointer for direct reads 
There's an optimization here to sink direct (i.e. not relative) reads of
an array past unrelated direct writes. However, since each write
actually reads, modifies, and then writes again to the array, this means
that we need to read the latest updated array. The old RA used the array
id instead of the SSA information, so it didn't care, but the new RA
uses ->instr instead and ignores the array id because arrays are now SSA
so it needs to be correct.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
40a1c4ba2d ir3/postsched: Fix ir3_postsched_node::delay calculation 
This wasn't using the same calculation that add_reg_dep() was using to
get the index into state->regs, so it was using the wrong register. Fix
this by folding it into add_reg_dep().

This shouldn't fix anything, because it's just used for scheduler
priorities, but it should reduce nop's and syncs.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
4b41ffc231 ir3/delay: Remove special case for array deps 
The case it was trying to handle (array read-after-write depedendencies)
is already handled by the normal SSA source handling, so this is just
useless.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
873e21f4e9 ir3/postsched: Use correct src index 
Match what ir3_delay_calc() does. Caught by an assert later.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
af7f29a78e ir3/sched: Use correct src index 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
7df7bab03b ir3/cp: Clone registers for compare-folding optimization 
Sharing the same register between instructions happened to work with the
old RA, but not with the new RA because they may get different register
assignments.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Connor Abbott
e597f8b122 ir3/postsched: Fix dependencies for a0.x/p0.x 
a0.x is written as a half-reg, but just interpreting it as "hr61.x" will
result in it overlapping with r30.z in merged mode, which is not what
the hardware does at all. This introduced a spurious dependency on
a write to r30.z which resulted in an assert tripping. Just pretend it's
a full reg instead.

This fixes
spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-vec3-index-wr-before-tcs
with the new RA.

Fixes: 0f78c32 ("freedreno/ir3: post-RA sched pass")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10591>
 2021-05-03 19:52:31 +00:00
Alyssa Rosenzweig
3ddc7c0e15 panfrost: Remove old dEQP workaround 
Nobody else needs it.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10589>
 2021-05-03 19:29:30 +00:00
Adam Jackson
f5d6a1b916 Revert "glx: s/Display */struct glx_display */ over internal API" 
This broke texture-from-pixmap in OBS Studio so I must have done
something wrong and also we need better tfp testing.

This reverts commit b02b26b87c.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4718
Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10593>
 2021-05-03 15:00:41 -04:00
Danylo Piliaiev
ea72be8b7c ir3: do not fold cmps from different blocks with non-null address 
Scheduling don't like address being in the different block from
the instruction.

Fixes a crash in the trace of "War Thunder" (DX11)

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10355>
 2021-05-03 17:25:05 +00:00
Mike Blumenkrantz
457a030b87 iris: fix indirect drawid 
iteration needs to be added to the offset now

Fixes: dae3113c3d ("gallium: split drawid out of pipe_draw_info and as a separate draw_vbo param")

Tested-by: Mark Janes <markjanes@swizzler.org>

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10555>
 2021-05-03 17:13:18 +00:00
Jason Ekstrand
94c1e65de9 intel/eu: Set message subtype properly for SIMD8 FB fetch 
There were two bugs which crep in here as part of 64551610d1:
forgetting that exec sizes in HW are in log2 space and having the
exec_size condition for the subtype backwards.

Fixes: 64551610d1 "intel/compiler: rework message descriptors..."
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10588>
 2021-05-03 15:30:41 +00:00
Alyssa Rosenzweig
0ec27d02e1 panfrost: Don't unroll loops in GLSL 
GLSL loop analysis is trouble. Just use NIR.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
8a4e735506 pan/bi: Workaround *V2F32_TO_V2F16 erratum 
Exact conditions this workaround is needed unknown. Determined
experimentally.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
daeb3507c2 pan/bi: Don't schedule clamps to +FADD.v2f16 
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
b88cb49e4b pan/bi: Add and use bi_negzero helper 
-0.0 is the additive identity in IEEE 754 arithmetic, not +0.0!

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
2a0060e63d pan/bi: Lower swizzles on CLPER 
Needed for vectorized FP16 derivatives.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
998cbe13d4 pan/bi: Fix loads and stores smaller than 32 bits 
Spiritual successor to Icecream95's patch of the same name.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Icecream95
0ca7926bb6 pan/bi: Replace lane0 modifier with lane_dest for load instructions 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Icecream95
b361a806bb pan/bi: Add "lane_dest" modifier 
Similar to the "lane" modifier, but for the instruction destination
instead the sources.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
5fe4f245a5 pan/bi: Implement vectorized int downcasts 
Just MKVEC but needs the usual special handling.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
caebca4aa7 pan/bi: Improve assert for vector size errors 
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
2f4bb3d6b9 pan/bi: Fix 16-bit fsat 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
d43c0f35ff pan/bi: Implement vectorized f32_to_f16 
f2f16 needs special treatment since it can access multiple 32-bit words.
Corresponds to the two-op instruction V2F32_TO_V2F16.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
1fb681e51d pan/bi: Emit int CSEL instead of float by default 
Will be needed when we use 1-bit booleans.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
cf2d575d63 pan/bi: Support 16-bit load_interpolated_input 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
d35075a7be pan/bi: Union modifiers from across variants 
itertools.groupby depends on sorting, so this code was quietly broken on
cases like FADD.v2f16.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
394f3f8b74 pan/bi: Simplify Python expression 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
68c4a30434 pan/bi: Don't reference nir_lower_mediump_outputs 
Nonexistant.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00
Alyssa Rosenzweig
1cb11969be pan/bi: Add simple constant folding pass 
Cleans up swizzle lowering, and will be used for other cleanup as
well (fancy texturing tends to create a lot of foldable code).

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10392>
 2021-05-03 15:10:20 +00:00