fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: remove now unused GLSL IR validate_geometry_shader_emissions()

Browse source 
We now use the nir version of this validation pass instead.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27377>
This commit is contained in:
Timothy Arceri 2024-01-31 12:25:58 +11:00 • committed by Marge Bot
parent ce3420394c
commit ec4990ef41
1 changed files with 0 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
src/compiler/glsl/linker.cpp
View file

@ -357,100 +357,6 @@ public:
}
};
/**
* Visitor that determines the highest stream id to which a (geometry) shader
* emits vertices. It also checks whether End{Stream}Primitive is ever called.
*/
class find_emit_vertex_visitor : public ir_hierarchical_visitor {
public:
find_emit_vertex_visitor(int max_allowed)
: max_stream_allowed(max_allowed),
invalid_stream_id(0),
invalid_stream_id_from_emit_vertex(false),
end_primitive_found(false),
used_streams(0)
{
/* empty */
}
virtual ir_visitor_status visit_leave(ir_emit_vertex *ir)
{
int stream_id = ir->stream_id();
if (stream_id < 0) {
invalid_stream_id = stream_id;
invalid_stream_id_from_emit_vertex = true;
return visit_stop;
}
if (stream_id > max_stream_allowed) {
invalid_stream_id = stream_id;
invalid_stream_id_from_emit_vertex = true;
return visit_stop;
}
used_streams |= 1 << stream_id;
return visit_continue;
}
virtual ir_visitor_status visit_leave(ir_end_primitive *ir)
{
end_primitive_found = true;
int stream_id = ir->stream_id();
if (stream_id < 0) {
invalid_stream_id = stream_id;
invalid_stream_id_from_emit_vertex = false;
return visit_stop;
}
if (stream_id > max_stream_allowed) {
invalid_stream_id = stream_id;
invalid_stream_id_from_emit_vertex = false;
return visit_stop;
}
used_streams |= 1 << stream_id;
return visit_continue;
}
bool error()
{
return invalid_stream_id != 0;
}
const char *error_func()
{
return invalid_stream_id_from_emit_vertex ?
"EmitStreamVertex" : "EndStreamPrimitive";
}
int error_stream()
{
return invalid_stream_id;
}
unsigned active_stream_mask()
{
return used_streams;
}
bool uses_end_primitive()
{
return end_primitive_found;
}
private:
int max_stream_allowed;
int invalid_stream_id;
bool invalid_stream_id_from_emit_vertex;
bool end_primitive_found;
unsigned used_streams;
};
} /* anonymous namespace */
void
@ -704,61 +610,6 @@ validate_geometry_shader_executable(struct gl_shader_program *prog,
analyze_clip_cull_usage(prog, shader, consts, &shader->Program->info);
}
/**
* Check if geometry shaders emit to non-zero streams and do corresponding
* validations.
*/
static void
validate_geometry_shader_emissions(const struct gl_constants *consts,
struct gl_shader_program *prog)
{
struct gl_linked_shader *sh = prog->_LinkedShaders[MESA_SHADER_GEOMETRY];
if (sh != NULL) {
find_emit_vertex_visitor emit_vertex(consts->MaxVertexStreams - 1);
emit_vertex.run(sh->ir);
if (emit_vertex.error()) {
linker_error(prog, "Invalid call %s(%d). Accepted values for the "
"stream parameter are in the range [0, %d].\n",
emit_vertex.error_func(),
emit_vertex.error_stream(),
consts->MaxVertexStreams - 1);
}
prog->Geom.ActiveStreamMask = emit_vertex.active_stream_mask();
prog->Geom.UsesEndPrimitive = emit_vertex.uses_end_primitive();
/* From the ARB_gpu_shader5 spec:
*
* "Multiple vertex streams are supported only if the output primitive
* type is declared to be "points". A program will fail to link if it
* contains a geometry shader calling EmitStreamVertex() or
* EndStreamPrimitive() if its output primitive type is not "points".
*
* However, in the same spec:
*
* "The function EmitVertex() is equivalent to calling EmitStreamVertex()
* with <stream> set to zero."
*
* And:
*
* "The function EndPrimitive() is equivalent to calling
* EndStreamPrimitive() with <stream> set to zero."
*
* Since we can call EmitVertex() and EndPrimitive() when we output
* primitives other than points, calling EmitStreamVertex(0) or
* EmitEndPrimitive(0) should not produce errors. This it also what Nvidia
* does. We can use prog->Geom.ActiveStreamMask to check whether only the
* first (zero) stream is active.
* stream.
*/
if (prog->Geom.ActiveStreamMask & ~(1 << 0) &&
sh->Program->info.gs.output_primitive != MESA_PRIM_POINTS) {
linker_error(prog, "EmitStreamVertex(n) and EndStreamPrimitive(n) "
"with n>0 requires point output\n");
}
}
}
bool
validate_intrastage_arrays(struct gl_shader_program *prog,
ir_variable *const var,