Mesa (master): nvc0: undo overzealous enum usage

Ilia Mirkin imirkin at kemper.freedesktop.org
Tue Aug 30 04:18:39 UTC 2016


Module: Mesa
Branch: master
Commit: ab0917311fbf7b0f03afc4aa1239d7b02b00fc87
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab0917311fbf7b0f03afc4aa1239d7b02b00fc87

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Tue Aug 30 00:16:17 2016 -0400

nvc0: undo overzealous enum usage

Commit 7413625ad3 flipped a few functions too many to use
pipe_shader_type. These functions actually take an integer that does not
correspond 1:1 with the enum.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index 6aaada4..4de2619 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -427,7 +427,7 @@ nvc0_sampler_state_delete(struct pipe_context *pipe, void *hwcso)
 
 static inline void
 nvc0_stage_sampler_states_bind(struct nvc0_context *nvc0,
-                               enum pipe_shader_type s,
+                               unsigned s,
                                unsigned nr, void **hwcso)
 {
    unsigned i;
@@ -457,7 +457,7 @@ nvc0_stage_sampler_states_bind(struct nvc0_context *nvc0,
 
 static void
 nvc0_stage_sampler_states_bind_range(struct nvc0_context *nvc0,
-                                     const enum pipe_shader_type s,
+                                     unsigned s,
                                      unsigned start, unsigned nr, void **cso)
 {
    const unsigned end = start + nr;




More information about the mesa-commit mailing list