From e9147bfab40d26fb8f8c0794e9a3fdcf14ca57dd Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 6 Feb 2008 00:26:49 +1100 Subject: nv40: cleanup state handling a bit --- src/mesa/pipe/nv40/nv40_state.h | 68 +---------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) (limited to 'src/mesa/pipe/nv40/nv40_state.h') diff --git a/src/mesa/pipe/nv40/nv40_state.h b/src/mesa/pipe/nv40/nv40_state.h index 24eea36db3..e82ab9de98 100644 --- a/src/mesa/pipe/nv40/nv40_state.h +++ b/src/mesa/pipe/nv40/nv40_state.h @@ -3,20 +3,6 @@ #include "pipe/p_state.h" -struct nv40_blend_state { - uint32_t b_enable; - uint32_t b_srcfunc; - uint32_t b_dstfunc; - uint32_t b_eqn; - - uint32_t l_enable; - uint32_t l_op; - - uint32_t c_mask; - - uint32_t d_enable; -}; - struct nv40_sampler_state { uint32_t fmt; uint32_t wrap; @@ -25,29 +11,6 @@ struct nv40_sampler_state { uint32_t bcol; }; -struct nv40_rasterizer_state { - uint32_t shade_model; - - uint32_t line_width; - uint32_t line_smooth_en; - uint32_t line_stipple_en; - uint32_t line_stipple; - - uint32_t point_size; - - uint32_t poly_smooth_en; - uint32_t poly_stipple_en; - - uint32_t poly_mode_front; - uint32_t poly_mode_back; - - uint32_t front_face; - uint32_t cull_face; - uint32_t cull_face_en; - - uint32_t point_sprite; -}; - struct nv40_vertex_program_exec { uint32_t data[4]; boolean has_branch_offset; @@ -99,36 +62,7 @@ struct nv40_fragment_program { struct pipe_buffer *buffer; uint32_t fp_control; -}; - -struct nv40_stencil_push { - uint32_t enable; - uint32_t wmask; - uint32_t func; - uint32_t ref; - uint32_t vmask; - uint32_t fail; - uint32_t zfail; - uint32_t zpass; -}; - -struct nv40_depth_stencil_alpha_state { - struct { - uint32_t func; - uint32_t write_enable; - uint32_t test_enable; - } depth; - - struct { - struct nv40_stencil_push back; - struct nv40_stencil_push front; - } stencil; - - struct { - uint32_t enabled; - uint32_t func; - uint32_t ref; - } alpha; + struct nouveau_stateobj *so; }; struct nv40_miptree { -- cgit v1.2.3