aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv50/nv50_stateobj.h
diff options
context:
space:
mode:
authorChristoph Bumiller <[email protected]>2011-03-04 22:15:17 +0100
committerChristoph Bumiller <[email protected]>2011-03-05 00:51:07 +0100
commit1f5d6fc59bd899e211c70026eb74cd2219858008 (patch)
treee00a5abe3158dff9e80cd6391b92496a31f51986 /src/gallium/drivers/nv50/nv50_stateobj.h
parente4c968cdbbdc020afbf869d12b536c0a0dbf9de8 (diff)
nv50,nvc0: share sampler state creation
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_stateobj.h')
-rw-r--r--src/gallium/drivers/nv50/nv50_stateobj.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/gallium/drivers/nv50/nv50_stateobj.h b/src/gallium/drivers/nv50/nv50_stateobj.h
index f4e458b0c05..cf5b92ef1a8 100644
--- a/src/gallium/drivers/nv50/nv50_stateobj.h
+++ b/src/gallium/drivers/nv50/nv50_stateobj.h
@@ -16,35 +16,14 @@
#define SB_DATA(so, u) (so)->state[(so)->size++] = (u)
+#include "nv50_stateobj_tex.h"
+
struct nv50_blend_stateobj {
struct pipe_blend_state pipe;
int size;
uint32_t state[78];
};
-struct nv50_tsc_entry {
- int id;
- uint32_t tsc[8];
-};
-
-static INLINE struct nv50_tsc_entry *
-nv50_tsc_entry(void *hwcso)
-{
- return (struct nv50_tsc_entry *)hwcso;
-}
-
-struct nv50_tic_entry {
- struct pipe_sampler_view pipe;
- int id;
- uint32_t tic[8];
-};
-
-static INLINE struct nv50_tic_entry *
-nv50_tic_entry(struct pipe_sampler_view *view)
-{
- return (struct nv50_tic_entry *)view;
-}
-
struct nv50_rasterizer_stateobj {
struct pipe_rasterizer_state pipe;
int size;