summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro PiƱeiro <[email protected]>2016-04-21 12:23:47 +0200
committerJuan A. Suarez Romero <[email protected]>2017-01-12 12:56:35 +0100
commitf8310189f4a31c443657cd0c1aef35db02b86c95 (patch)
treea9b16baca5f5494dc1835f8631e11970f8d0b819
parent329cbe363dcc465764719d91f8f31c8606769ba4 (diff)
i965/vec4: use attribute slots for first non payload GRF
As part of the payload setup, setup_attributes is called with the first GRF that can be used for the attributes (first ones are used for uniforms for example) and returns the first GRF that is not part of the payload. Before this patch, it adds directly the number of attributes. But as with 64-bit attributes can consume more than one slot, that is not valid anymore. This patch change the addition to use the number of slots consumed. gen >= 8 would not be affected, as they use the scalar mode. For that case, the vs configuration is done at fs_visitor::assign_vs_urb_setup. v2: add explanation in commit log (Jordan) Reviewed-by: Jordan Justen <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index 5ddbe580d5a..f80162d8203 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -1757,7 +1757,7 @@ vec4_vs_visitor::setup_attributes(int payload_reg)
lower_attributes_to_hw_regs(attribute_map, false /* interleaved */);
- return payload_reg + vs_prog_data->nr_attributes;
+ return payload_reg + vs_prog_data->nr_attribute_slots;
}
int