diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_shader.c | 28 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_shader.h | 69 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 34 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 1 |
6 files changed, 97 insertions, 40 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h index 3bba6d1a893..4b9884e4421 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h @@ -262,10 +262,6 @@ void r600_init_query_functions(struct r600_context *rctx); /* r600_resource.c */ void r600_init_context_resource_functions(struct r600_context *r600); -/* radeonsi_shader.c */ -int si_pipe_shader_create(struct pipe_context *ctx, struct si_pipe_shader *shader); -void si_pipe_shader_destroy(struct pipe_context *ctx, struct si_pipe_shader *shader); - /* r600_texture.c */ void r600_init_screen_texture_functions(struct pipe_screen *screen); void r600_init_surface_functions(struct r600_context *r600); diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c b/src/gallium/drivers/radeonsi/radeonsi_shader.c index a05061765ef..ae8c9a96de9 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_shader.c +++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c @@ -1,4 +1,32 @@ +/* + * Copyright 2012 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Authors: + * Tom Stellard <[email protected]> + * Michel Dänzer <[email protected]> + * Christian König <[email protected]> + */ + #include "gallivm/lp_bld_tgsi_action.h" #include "gallivm/lp_bld_const.h" #include "gallivm/lp_bld_gather.h" diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.h b/src/gallium/drivers/radeonsi/radeonsi_shader.h index cd742f57da1..d44ee9b128b 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_shader.h +++ b/src/gallium/drivers/radeonsi/radeonsi_shader.h @@ -1,4 +1,69 @@ +/* + * Copyright 2012 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Authors: + * Tom Stellard <[email protected]> + * Michel Dänzer <[email protected]> + * Christian König <[email protected]> + */ -struct tgsi_token; +#ifndef RADEONSI_SHADER_H +#define RADEONSI_SHADER_H -void si_test(struct tgsi_token * token, unsigned type); +struct si_shader_io { + unsigned name; + int sid; + unsigned param_offset; + unsigned interpolate; + bool centroid; +}; + +struct si_shader { + unsigned ninput; + struct si_shader_io input[32]; + + unsigned noutput; + struct si_shader_io output[32]; + + bool uses_kill; + bool fs_write_all; + unsigned nr_cbufs; +}; + +struct si_pipe_shader { + struct si_shader shader; + struct si_pm4_state *pm4; + struct si_resource *bo; + struct tgsi_token *tokens; + unsigned num_sgprs; + unsigned num_vgprs; + unsigned spi_ps_input_ena; + unsigned sprite_coord_enable; + struct pipe_stream_output_info so; + unsigned so_strides[4]; +}; + +/* radeonsi_shader.c */ +int si_pipe_shader_create(struct pipe_context *ctx, struct si_pipe_shader *shader); +void si_pipe_shader_destroy(struct pipe_context *ctx, struct si_pipe_shader *shader); + +#endif diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 94b8b43a878..1cd361013cc 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -30,6 +30,7 @@ #include "util/u_pack_color.h" #include "tgsi/tgsi_parse.h" #include "radeonsi_pipe.h" +#include "radeonsi_shader.h" #include "si_state.h" #include "sid.h" diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index fa1a8711b6e..6729fd4df55 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -68,40 +68,6 @@ struct si_vertex_element struct pipe_vertex_element elements[PIPE_MAX_ATTRIBS]; }; -struct si_shader_io { - unsigned name; - unsigned gpr; - unsigned done; - int sid; - unsigned param_offset; - unsigned interpolate; - bool centroid; -}; - -struct si_shader { - unsigned ninput; - unsigned noutput; - struct si_shader_io input[32]; - struct si_shader_io output[32]; - bool uses_kill; - bool fs_write_all; - unsigned nr_cbufs; -}; - -struct si_pipe_shader { - struct si_shader shader; - struct si_pm4_state *pm4; - struct si_resource *bo; - struct si_vertex_element vertex_elements; - struct tgsi_token *tokens; - unsigned num_sgprs; - unsigned num_vgprs; - unsigned spi_ps_input_ena; - unsigned sprite_coord_enable; - struct pipe_stream_output_info so; - unsigned so_strides[4]; -}; - union si_state { struct { struct si_pm4_state *init; diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 7af1944f82c..10cf54b0720 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -29,6 +29,7 @@ #include "util/u_blitter.h" #include "tgsi/tgsi_parse.h" #include "radeonsi_pipe.h" +#include "radeonsi_shader.h" #include "si_state.h" #include "sid.h" |