diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-02-05 09:50:21 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-02-05 09:50:21 +0000 |
commit | c036d13d7d2cc905226fe53ebd86a18da808963f (patch) | |
tree | 1520a41a750b3a2a2685c3d7f46e87f921ad7b83 /src/gallium/drivers/nv04/nv04_state.h | |
parent | 69f20294cd8bed52e4a9b648158423c5f0754941 (diff) | |
parent | 5b6b67eb3ff714fbba8aed88a22a7646e1dbf655 (diff) |
Merge commit 'fj/mesa-next'
Diffstat (limited to 'src/gallium/drivers/nv04/nv04_state.h')
-rw-r--r-- | src/gallium/drivers/nv04/nv04_state.h | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/src/gallium/drivers/nv04/nv04_state.h b/src/gallium/drivers/nv04/nv04_state.h deleted file mode 100644 index 81d1d2ebaa..0000000000 --- a/src/gallium/drivers/nv04/nv04_state.h +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef __NV04_STATE_H__ -#define __NV04_STATE_H__ - -#include "pipe/p_state.h" -#include "tgsi/tgsi_scan.h" - -struct nv04_blend_state { - uint32_t b_enable; - uint32_t b_src; - uint32_t b_dst; -}; - -struct nv04_fragtex_state { - uint32_t format; -}; - -struct nv04_sampler_state { - uint32_t filter; - uint32_t format; -}; - -struct nv04_depth_stencil_alpha_state { - uint32_t control; -}; - -struct nv04_rasterizer_state { - uint32_t blend; - - const struct pipe_rasterizer_state *templ; -}; - -struct nv04_miptree { - struct pipe_texture base; - struct nouveau_bo *bo; - - struct pipe_buffer *buffer; - uint total_size; - - struct { - uint pitch; - uint *image_offset; - } level[PIPE_MAX_TEXTURE_LEVELS]; -}; - -struct nv04_fragment_program_data { - unsigned offset; - unsigned index; -}; - -struct nv04_fragment_program { - struct pipe_shader_state pipe; - struct tgsi_shader_info info; - - boolean translated; - boolean on_hw; - unsigned samplers; - - uint32_t *insn; - int insn_len; - - struct nv04_fragment_program_data *consts; - unsigned nr_consts; - - struct pipe_buffer *buffer; - - uint32_t fp_control; - uint32_t fp_reg_control; -}; - - - -#endif |