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

glsl: handle varyings that are not written to but have an xfb_offset

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Timothy Arceri
2016-03-14 10:32:17 +11:00
parent d5c09d40b9
commit c95e92b14d
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/compiler/glsl/link_varyings.cpp
View File

@@ -738,14 +738,26 @@ tfeedback_decl::store(struct gl_context *ctx, struct gl_shader_program *prog,
unsigned num_components = this->num_components(); unsigned num_components = this->num_components();
while (num_components > 0) { while (num_components > 0) {
unsigned output_size = MIN2(num_components, 4 - location_frac); unsigned output_size = MIN2(num_components, 4 - location_frac);
assert(info->NumOutputs < max_outputs); assert((info->NumOutputs == 0 && max_outputs == 0) ||
info->Outputs[info->NumOutputs].ComponentOffset = location_frac; info->NumOutputs < max_outputs);
info->Outputs[info->NumOutputs].OutputRegister = location;
info->Outputs[info->NumOutputs].NumComponents = output_size; /* From the ARB_enhanced_layouts spec:
info->Outputs[info->NumOutputs].StreamId = stream_id; *
info->Outputs[info->NumOutputs].OutputBuffer = buffer; * "If such a block member or variable is not written during a shader
info->Outputs[info->NumOutputs].DstOffset = xfb_offset; * invocation, the buffer contents at the assigned offset will be
++info->NumOutputs; * undefined. Even if there are no static writes to a variable or
* member that is assigned a transform feedback offset, the space is
* still allocated in the buffer and still affects the stride."
*/
if (this->is_varying_written()) {
info->Outputs[info->NumOutputs].ComponentOffset = location_frac;
info->Outputs[info->NumOutputs].OutputRegister = location;
info->Outputs[info->NumOutputs].NumComponents = output_size;
info->Outputs[info->NumOutputs].StreamId = stream_id;
info->Outputs[info->NumOutputs].OutputBuffer = buffer;
info->Outputs[info->NumOutputs].DstOffset = xfb_offset;
++info->NumOutputs;
}
info->Buffers[buffer].Stream = this->stream_id; info->Buffers[buffer].Stream = this->stream_id;
xfb_offset += output_size; xfb_offset += output_size;
@@ -936,8 +948,10 @@ store_tfeedback_info(struct gl_context *ctx, struct gl_shader_program *prog,
num_tfeedback_decls); num_tfeedback_decls);
unsigned num_outputs = 0; unsigned num_outputs = 0;
for (unsigned i = 0; i < num_tfeedback_decls; ++i) for (unsigned i = 0; i < num_tfeedback_decls; ++i) {
num_outputs += tfeedback_decls[i].get_num_outputs(); if (tfeedback_decls[i].is_varying_written())
num_outputs += tfeedback_decls[i].get_num_outputs();
}
prog->LinkedTransformFeedback.Outputs = prog->LinkedTransformFeedback.Outputs =
rzalloc_array(prog, rzalloc_array(prog,

8
src/compiler/glsl/link_varyings.h
View File

@@ -108,6 +108,14 @@ public:
return this->next_buffer_separator; return this->next_buffer_separator;
} }
bool is_varying_written() const
{
if (this->next_buffer_separator || this->skip_components)
return false;
return this->matched_candidate->toplevel_var->data.assigned;
}
bool is_varying() const bool is_varying() const
{ {
return !this->next_buffer_separator && !this->skip_components; return !this->next_buffer_separator && !this->skip_components;