From b273928140479f089d45cd2dbc30708306b97ee0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 8 Jul 2010 11:03:44 -0600 Subject: gallium: bump PIPE_MAX_SHADER_INPUTS/OUTPUTS to 32 --- src/gallium/include/pipe/p_state.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gallium/include/pipe/p_state.h') diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 6231f06ec7..197b64e8f1 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -61,8 +61,8 @@ extern "C" { #define PIPE_MAX_SAMPLERS 16 #define PIPE_MAX_VERTEX_SAMPLERS 16 #define PIPE_MAX_GEOMETRY_SAMPLERS 16 -#define PIPE_MAX_SHADER_INPUTS 16 -#define PIPE_MAX_SHADER_OUTPUTS 16 +#define PIPE_MAX_SHADER_INPUTS 32 +#define PIPE_MAX_SHADER_OUTPUTS 32 #define PIPE_MAX_TEXTURE_LEVELS 16 #define PIPE_MAX_SO_BUFFERS 4 -- cgit v1.2.3 From d350695a6b86caaee6b2bd1d64b48a26159a8e95 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 21 Jul 2010 15:39:09 +0100 Subject: gallium: remove pointless bitfield restrction in pipe_vertex_element This used to be a somewhat packed struct, but no longer. Remove the last remaining bitfield tag. --- src/gallium/include/pipe/p_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium/include/pipe/p_state.h') diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 197b64e8f1..44ffa26be7 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -419,7 +419,7 @@ struct pipe_vertex_element /** Which vertex_buffer (as given to pipe->set_vertex_buffer()) does * this attribute live in? */ - unsigned vertex_buffer_index:8; + unsigned vertex_buffer_index; enum pipe_format src_format; }; -- cgit v1.2.3 From f47c9b088056e25a0a007b16045631df70001c8f Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Wed, 21 Jul 2010 09:13:53 +0200 Subject: gallium: add depth clamp to the interface --- src/gallium/include/pipe/p_defines.h | 3 ++- src/gallium/include/pipe/p_state.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gallium/include/pipe/p_state.h') diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index aa39fdec0d..00aa2076ed 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -491,7 +491,8 @@ enum pipe_cap { PIPE_CAP_MAX_VS_ADDRS, PIPE_CAP_MAX_VS_PREDS, - PIPE_CAP_GEOMETRY_SHADER4 + PIPE_CAP_GEOMETRY_SHADER4, + PIPE_CAP_DEPTH_CLAMP }; diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 44ffa26be7..301fe2b74f 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -155,6 +155,7 @@ struct pipe_clip_state { float ucp[PIPE_MAX_CLIP_PLANES][4]; unsigned nr; + unsigned depth_clamp:1; }; -- cgit v1.2.3