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

nir: pack nir_variable::data::stream

Browse Source 
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Marek Olšák
2019-10-25 14:55:06 -04:00
parent 9be4a422a0
commit 08dc541b66
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -445,6 +445,8 @@ nir_visitor::visit(ir_variable *ir)
var->data.invariant = ir->data.invariant;
var->data.location = ir->data.location;
var->data.stream = ir->data.stream;
if (ir->data.stream & (1u << 31))
var->data.stream |= NIR_STREAM_PACKED;
var->data.compact = false;
switch(ir->data.mode) {

7
src/compiler/nir/nir.h
View File

@@ -60,6 +60,7 @@ extern "C" {
#define NIR_TRUE (~0u)
#define NIR_MAX_VEC_COMPONENTS 4
#define NIR_MAX_MATRIX_COLUMNS 4
#define NIR_STREAM_PACKED (1 << 8)
typedef uint8_t nir_component_mask_t;
/** Defines a cast function
@@ -450,10 +451,10 @@ typedef struct nir_variable {
/**
* Vertex stream output identifier.
*
* For packed outputs, bit 31 is set and bits [2*i+1,2*i] indicate the
* stream of the i-th component.
* For packed outputs, NIR_STREAM_PACKED is set and bits [2*i+1,2*i]
* indicate the stream of the i-th component.
*/
unsigned stream;
unsigned stream:9;
/**
* output index for dual source blending.

4
src/gallium/drivers/radeonsi/si_shader_nir.c
View File

@@ -466,8 +466,8 @@ static void scan_output_slot(const nir_variable *var,
ubyte usagemask = ((1 << num_components) - 1) << component;
unsigned gs_out_streams;
if (var->data.stream & (1u << 31)) {
gs_out_streams = var->data.stream & ~(1u << 31);
if (var->data.stream & NIR_STREAM_PACKED) {
gs_out_streams = var->data.stream & ~NIR_STREAM_PACKED;
} else {
assert(var->data.stream < 4);
gs_out_streams = 0;