Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / gallium / drivers / freedreno / a3xx / fd3_texture.h

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
index a83f527366b1dca0bfc4b770b47da684d38a3dac..d5afb03cd7a41cf635708abaa7cec93312411877 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
@@ -35,14 +35,15 @@
 #include "freedreno_resource.h"
 
 #include "fd3_context.h"
-#include "fd3_util.h"
+#include "fd3_format.h"
 
 struct fd3_sampler_stateobj {
        struct pipe_sampler_state base;
        uint32_t texsamp0, texsamp1;
+       bool saturate_s, saturate_t, saturate_r;
 };
 
-static INLINE struct fd3_sampler_stateobj *
+static inline struct fd3_sampler_stateobj *
 fd3_sampler_stateobj(struct pipe_sampler_state *samp)
 {
        return (struct fd3_sampler_stateobj *)samp;
@@ -50,11 +51,10 @@ fd3_sampler_stateobj(struct pipe_sampler_state *samp)
 
 struct fd3_pipe_sampler_view {
        struct pipe_sampler_view base;
-       struct fd_resource *tex_resource;
        uint32_t texconst0, texconst1, texconst2, texconst3;
 };
 
-static INLINE struct fd3_pipe_sampler_view *
+static inline struct fd3_pipe_sampler_view *
 fd3_pipe_sampler_view(struct pipe_sampler_view *pview)
 {
        return (struct fd3_pipe_sampler_view *)pview;