summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/nine/nine_state.h
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2016-10-28 19:05:31 +0200
committerAxel Davy <[email protected]>2016-12-20 23:44:22 +0100
commit66ad5b1592bb050269216bc64aa7916056cca466 (patch)
treec244904e7f422f27e58082b0af798aa1a7ce578b /src/gallium/state_trackers/nine/nine_state.h
parentfc49f7df8920df77dfbb0163a11486494f0c7883 (diff)
st/nine: Rename pipe to pipe_data in nine_context
This patch it to avoid name conflict when device->pipe will be moved to nine_context. Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/nine_state.h')
-rw-r--r--src/gallium/state_trackers/nine/nine_state.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/nine/nine_state.h b/src/gallium/state_trackers/nine/nine_state.h
index d6189877f65..921074df1bb 100644
--- a/src/gallium/state_trackers/nine/nine_state.h
+++ b/src/gallium/state_trackers/nine/nine_state.h
@@ -302,7 +302,7 @@ struct nine_context {
struct pipe_constant_buffer cb_ps;
struct pipe_constant_buffer cb_vs_ff;
struct pipe_constant_buffer cb_ps_ff;
- } pipe;
+ } pipe_data;
};
struct nine_state_sw_internal {