OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nouveau/codegen: Do not keep redundant info for tessellation domain

Browse Source 
Just add an assert instead.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
George Ouzounoudis
2023-07-30 15:31:56 +03:00
committed by Marge Bot
parent 94e5eb68f4
commit b2fa2ed04e
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nouveau/codegen/nv50_ir_driver.h
View File

@@ -103,9 +103,6 @@ struct nv50_ir_prog_info
uint32_t gridInfoBase; /* base address for NTID,NCTAID */ uint32_t gridInfoBase; /* base address for NTID,NCTAID */
uint16_t numThreads[3]; /* max number of threads */ uint16_t numThreads[3]; /* max number of threads */
} cp; } cp;
struct {
uint8_t prespecified_domain; /* MESA_PRIM_{QUADS,TRIANGLES,LINES}, POINTS if unspecified */
} tese;
} prop; } prop;
struct { struct {

14
src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
View File

@@ -2916,17 +2916,13 @@ NVC0LoweringPass::handleLDST(Instruction *i)
void void
NVC0LoweringPass::readTessCoord(LValue *dst, int c) NVC0LoweringPass::readTessCoord(LValue *dst, int c)
{ {
// GLSL requires domain qualifier to be defined in TES while SPIRV allows // In case of SPIRV the domain can be specified in the tesc shader,
// domain to be defined in TES and/or TCS // but this should be passed to tese shader by merge_tess_info.
uint8_t domain = prog->driver_out->prop.tp.domain; const uint8_t domain = prog->driver_out->prop.tp.domain;
const bool tese_defined_domain = assert(
domain == MESA_PRIM_LINES || domain == MESA_PRIM_LINES ||
domain == MESA_PRIM_TRIANGLES || domain == MESA_PRIM_TRIANGLES ||
domain == MESA_PRIM_QUADS; domain == MESA_PRIM_QUADS);
if (!tese_defined_domain) {
domain = prog->driver->prop.tese.prespecified_domain;
}
Value *laneid = bld.getSSA(); Value *laneid = bld.getSSA();
Value *x, *y; Value *x, *y;