Commit 3160cbab authored by Jose Fonseca's avatar Jose Fonseca
Browse files

llvmpipe: setup_context -> lp_setup_context

Otherwise IDEs and debuggers have trouble distinguishing from softpipe's
setup_context.
parent 83fe7149
......@@ -45,7 +45,7 @@ struct draw_stage;
struct lp_fragment_shader;
struct lp_vertex_shader;
struct lp_blend_state;
struct setup_context;
struct lp_setup_context;
struct lp_velems_state;
struct llvmpipe_context {
......@@ -98,7 +98,7 @@ struct llvmpipe_context {
int psize_slot;
/** The tiling engine */
struct setup_context *setup;
struct lp_setup_context *setup;
/** The primitive drawing context */
struct draw_context *draw;
......
......@@ -95,7 +95,7 @@ struct lp_rast_shader_inputs {
* Rasterization information for a triangle known to be in this bin,
* plus inputs to run the shader:
* These fields are tile- and bin-independent.
* Objects of this type are put into the setup_context::data buffer.
* Objects of this type are put into the lp_setup_context::data buffer.
*/
struct lp_rast_triangle {
#ifdef DEBUG
......
......@@ -52,11 +52,11 @@
#include "draw/draw_vbuf.h"
static void set_scene_state( struct setup_context *, unsigned );
static void set_scene_state( struct lp_setup_context *, unsigned );
struct lp_scene *
lp_setup_get_current_scene(struct setup_context *setup)
lp_setup_get_current_scene(struct lp_setup_context *setup)
{
if (!setup->scene) {
......@@ -74,7 +74,7 @@ lp_setup_get_current_scene(struct setup_context *setup)
static void
first_triangle( struct setup_context *setup,
first_triangle( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4],
const float (*v2)[4])
......@@ -85,7 +85,7 @@ first_triangle( struct setup_context *setup,
}
static void
first_line( struct setup_context *setup,
first_line( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4])
{
......@@ -95,7 +95,7 @@ first_line( struct setup_context *setup,
}
static void
first_point( struct setup_context *setup,
first_point( struct lp_setup_context *setup,
const float (*v0)[4])
{
set_scene_state( setup, SETUP_ACTIVE );
......@@ -103,7 +103,7 @@ first_point( struct setup_context *setup,
setup->point( setup, v0 );
}
static void reset_context( struct setup_context *setup )
static void reset_context( struct lp_setup_context *setup )
{
LP_DBG(DEBUG_SETUP, "%s\n", __FUNCTION__);
......@@ -131,7 +131,7 @@ static void reset_context( struct setup_context *setup )
/** Rasterize all scene's bins */
static void
lp_setup_rasterize_scene( struct setup_context *setup,
lp_setup_rasterize_scene( struct lp_setup_context *setup,
boolean write_depth )
{
struct lp_scene *scene = lp_setup_get_current_scene(setup);
......@@ -148,7 +148,7 @@ lp_setup_rasterize_scene( struct setup_context *setup,
static void
begin_binning( struct setup_context *setup )
begin_binning( struct lp_setup_context *setup )
{
struct lp_scene *scene = lp_setup_get_current_scene(setup);
......@@ -184,7 +184,7 @@ begin_binning( struct setup_context *setup )
* TODO: fast path for fullscreen clears and no triangles.
*/
static void
execute_clears( struct setup_context *setup )
execute_clears( struct lp_setup_context *setup )
{
LP_DBG(DEBUG_SETUP, "%s\n", __FUNCTION__);
......@@ -194,7 +194,7 @@ execute_clears( struct setup_context *setup )
static void
set_scene_state( struct setup_context *setup,
set_scene_state( struct lp_setup_context *setup,
unsigned new_state )
{
unsigned old_state = setup->state;
......@@ -229,7 +229,7 @@ set_scene_state( struct setup_context *setup,
void
lp_setup_flush( struct setup_context *setup,
lp_setup_flush( struct lp_setup_context *setup,
unsigned flags )
{
LP_DBG(DEBUG_SETUP, "%s\n", __FUNCTION__);
......@@ -239,7 +239,7 @@ lp_setup_flush( struct setup_context *setup,
void
lp_setup_bind_framebuffer( struct setup_context *setup,
lp_setup_bind_framebuffer( struct lp_setup_context *setup,
const struct pipe_framebuffer_state *fb )
{
LP_DBG(DEBUG_SETUP, "%s\n", __FUNCTION__);
......@@ -256,7 +256,7 @@ lp_setup_bind_framebuffer( struct setup_context *setup,
void
lp_setup_clear( struct setup_context *setup,
lp_setup_clear( struct lp_setup_context *setup,
const float *color,
double depth,
unsigned stencil,
......@@ -314,7 +314,7 @@ lp_setup_clear( struct setup_context *setup,
* Emit a fence.
*/
struct pipe_fence_handle *
lp_setup_fence( struct setup_context *setup )
lp_setup_fence( struct lp_setup_context *setup )
{
struct lp_scene *scene = lp_setup_get_current_scene(setup);
const unsigned rank = lp_scene_get_num_bins( scene ); /* xxx */
......@@ -334,7 +334,7 @@ lp_setup_fence( struct setup_context *setup )
void
lp_setup_set_triangle_state( struct setup_context *setup,
lp_setup_set_triangle_state( struct lp_setup_context *setup,
unsigned cull_mode,
boolean ccw_is_frontface,
boolean scissor )
......@@ -350,7 +350,7 @@ lp_setup_set_triangle_state( struct setup_context *setup,
void
lp_setup_set_fs_inputs( struct setup_context *setup,
lp_setup_set_fs_inputs( struct lp_setup_context *setup,
const struct lp_shader_input *input,
unsigned nr )
{
......@@ -361,7 +361,7 @@ lp_setup_set_fs_inputs( struct setup_context *setup,
}
void
lp_setup_set_fs_functions( struct setup_context *setup,
lp_setup_set_fs_functions( struct lp_setup_context *setup,
lp_jit_frag_func jit_function0,
lp_jit_frag_func jit_function1,
boolean opaque )
......@@ -376,7 +376,7 @@ lp_setup_set_fs_functions( struct setup_context *setup,
}
void
lp_setup_set_fs_constants(struct setup_context *setup,
lp_setup_set_fs_constants(struct lp_setup_context *setup,
struct pipe_buffer *buffer)
{
LP_DBG(DEBUG_SETUP, "%s %p\n", __FUNCTION__, (void *) buffer);
......@@ -388,7 +388,7 @@ lp_setup_set_fs_constants(struct setup_context *setup,
void
lp_setup_set_alpha_ref_value( struct setup_context *setup,
lp_setup_set_alpha_ref_value( struct lp_setup_context *setup,
float alpha_ref_value )
{
LP_DBG(DEBUG_SETUP, "%s %f\n", __FUNCTION__, alpha_ref_value);
......@@ -400,7 +400,7 @@ lp_setup_set_alpha_ref_value( struct setup_context *setup,
}
void
lp_setup_set_blend_color( struct setup_context *setup,
lp_setup_set_blend_color( struct lp_setup_context *setup,
const struct pipe_blend_color *blend_color )
{
LP_DBG(DEBUG_SETUP, "%s\n", __FUNCTION__);
......@@ -415,7 +415,7 @@ lp_setup_set_blend_color( struct setup_context *setup,
void
lp_setup_set_scissor( struct setup_context *setup,
lp_setup_set_scissor( struct lp_setup_context *setup,
const struct pipe_scissor_state *scissor )
{
LP_DBG(DEBUG_SETUP, "%s\n", __FUNCTION__);
......@@ -430,7 +430,7 @@ lp_setup_set_scissor( struct setup_context *setup,
void
lp_setup_set_flatshade_first( struct setup_context *setup,
lp_setup_set_flatshade_first( struct lp_setup_context *setup,
boolean flatshade_first )
{
setup->flatshade_first = flatshade_first;
......@@ -438,7 +438,7 @@ lp_setup_set_flatshade_first( struct setup_context *setup,
void
lp_setup_set_vertex_info( struct setup_context *setup,
lp_setup_set_vertex_info( struct lp_setup_context *setup,
struct vertex_info *vertex_info )
{
/* XXX: just silently holding onto the pointer:
......@@ -451,7 +451,7 @@ lp_setup_set_vertex_info( struct setup_context *setup,
* Called during state validation when LP_NEW_TEXTURE is set.
*/
void
lp_setup_set_sampler_textures( struct setup_context *setup,
lp_setup_set_sampler_textures( struct lp_setup_context *setup,
unsigned num, struct pipe_texture **texture)
{
unsigned i;
......@@ -512,7 +512,7 @@ lp_setup_set_sampler_textures( struct setup_context *setup,
* being rendered and the current scene being built.
*/
unsigned
lp_setup_is_texture_referenced( const struct setup_context *setup,
lp_setup_is_texture_referenced( const struct lp_setup_context *setup,
const struct pipe_texture *texture )
{
unsigned i;
......@@ -541,7 +541,7 @@ lp_setup_is_texture_referenced( const struct setup_context *setup,
* Called by vbuf code when we're about to draw something.
*/
void
lp_setup_update_state( struct setup_context *setup )
lp_setup_update_state( struct lp_setup_context *setup )
{
struct lp_scene *scene = lp_setup_get_current_scene(setup);
......@@ -659,7 +659,7 @@ lp_setup_update_state( struct setup_context *setup )
/* Only caller is lp_setup_vbuf_destroy()
*/
void
lp_setup_destroy( struct setup_context *setup )
lp_setup_destroy( struct lp_setup_context *setup )
{
reset_context( setup );
......@@ -684,12 +684,12 @@ lp_setup_destroy( struct setup_context *setup )
* the draw module. Currently also creates a rasterizer to use with
* it.
*/
struct setup_context *
struct lp_setup_context *
lp_setup_create( struct pipe_context *pipe,
struct draw_context *draw )
{
unsigned i;
struct setup_context *setup = CALLOC_STRUCT(setup_context);
struct lp_setup_context *setup = CALLOC_STRUCT(lp_setup_context);
if (!setup)
return NULL;
......
......@@ -61,78 +61,78 @@ struct pipe_framebuffer_state;
struct lp_fragment_shader;
struct lp_jit_context;
struct setup_context *
struct lp_setup_context *
lp_setup_create( struct pipe_context *pipe,
struct draw_context *draw );
void
lp_setup_clear(struct setup_context *setup,
lp_setup_clear(struct lp_setup_context *setup,
const float *clear_color,
double clear_depth,
unsigned clear_stencil,
unsigned flags);
struct pipe_fence_handle *
lp_setup_fence( struct setup_context *setup );
lp_setup_fence( struct lp_setup_context *setup );
void
lp_setup_flush( struct setup_context *setup,
lp_setup_flush( struct lp_setup_context *setup,
unsigned flags );
void
lp_setup_bind_framebuffer( struct setup_context *setup,
lp_setup_bind_framebuffer( struct lp_setup_context *setup,
const struct pipe_framebuffer_state *fb );
void
lp_setup_set_triangle_state( struct setup_context *setup,
lp_setup_set_triangle_state( struct lp_setup_context *setup,
unsigned cullmode,
boolean front_is_ccw,
boolean scissor );
void
lp_setup_set_fs_inputs( struct setup_context *setup,
lp_setup_set_fs_inputs( struct lp_setup_context *setup,
const struct lp_shader_input *interp,
unsigned nr );
void
lp_setup_set_fs_functions( struct setup_context *setup,
lp_setup_set_fs_functions( struct lp_setup_context *setup,
lp_jit_frag_func jit_function0,
lp_jit_frag_func jit_function1,
boolean opaque );
void
lp_setup_set_fs_constants(struct setup_context *setup,
lp_setup_set_fs_constants(struct lp_setup_context *setup,
struct pipe_buffer *buffer);
void
lp_setup_set_alpha_ref_value( struct setup_context *setup,
lp_setup_set_alpha_ref_value( struct lp_setup_context *setup,
float alpha_ref_value );
void
lp_setup_set_blend_color( struct setup_context *setup,
lp_setup_set_blend_color( struct lp_setup_context *setup,
const struct pipe_blend_color *blend_color );
void
lp_setup_set_scissor( struct setup_context *setup,
lp_setup_set_scissor( struct lp_setup_context *setup,
const struct pipe_scissor_state *scissor );
void
lp_setup_set_sampler_textures( struct setup_context *setup,
lp_setup_set_sampler_textures( struct lp_setup_context *setup,
unsigned num, struct pipe_texture **texture);
unsigned
lp_setup_is_texture_referenced( const struct setup_context *setup,
lp_setup_is_texture_referenced( const struct lp_setup_context *setup,
const struct pipe_texture *texture );
void
lp_setup_set_flatshade_first( struct setup_context *setup,
lp_setup_set_flatshade_first( struct lp_setup_context *setup,
boolean flatshade_first );
void
lp_setup_set_vertex_info( struct setup_context *setup,
lp_setup_set_vertex_info( struct lp_setup_context *setup,
struct vertex_info *info );
......
......@@ -65,7 +65,7 @@ struct lp_scene_queue;
* Subclass of vbuf_render, plugged directly into the draw module as
* the rendering backend.
*/
struct setup_context
struct lp_setup_context
{
struct vbuf_render base;
......@@ -131,29 +131,29 @@ struct setup_context
unsigned dirty; /**< bitmask of LP_SETUP_NEW_x bits */
void (*point)( struct setup_context *,
void (*point)( struct lp_setup_context *,
const float (*v0)[4]);
void (*line)( struct setup_context *,
void (*line)( struct lp_setup_context *,
const float (*v0)[4],
const float (*v1)[4]);
void (*triangle)( struct setup_context *,
void (*triangle)( struct lp_setup_context *,
const float (*v0)[4],
const float (*v1)[4],
const float (*v2)[4]);
};
void lp_setup_choose_triangle( struct setup_context *setup );
void lp_setup_choose_line( struct setup_context *setup );
void lp_setup_choose_point( struct setup_context *setup );
void lp_setup_choose_triangle( struct lp_setup_context *setup );
void lp_setup_choose_line( struct lp_setup_context *setup );
void lp_setup_choose_point( struct lp_setup_context *setup );
struct lp_scene *lp_setup_get_current_scene(struct setup_context *setup);
struct lp_scene *lp_setup_get_current_scene(struct lp_setup_context *setup);
void lp_setup_init_vbuf(struct setup_context *setup);
void lp_setup_init_vbuf(struct lp_setup_context *setup);
void lp_setup_update_state( struct setup_context *setup );
void lp_setup_update_state( struct lp_setup_context *setup );
void lp_setup_destroy( struct setup_context *setup );
void lp_setup_destroy( struct lp_setup_context *setup );
#endif
......@@ -31,7 +31,7 @@
#include "lp_setup_context.h"
static void line_nop( struct setup_context *setup,
static void line_nop( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4] )
{
......@@ -39,7 +39,7 @@ static void line_nop( struct setup_context *setup,
void
lp_setup_choose_line( struct setup_context *setup )
lp_setup_choose_line( struct lp_setup_context *setup )
{
setup->line = line_nop;
}
......
......@@ -31,14 +31,14 @@
#include "lp_setup_context.h"
static void point_nop( struct setup_context *setup,
static void point_nop( struct lp_setup_context *setup,
const float (*v0)[4] )
{
}
void
lp_setup_choose_point( struct setup_context *setup )
lp_setup_choose_point( struct lp_setup_context *setup )
{
setup->point = point_nop;
}
......
......@@ -173,7 +173,7 @@ static void setup_facing_coef( struct lp_rast_triangle *tri,
/**
* Compute the tri->coef[] array dadx, dady, a0 values.
*/
static void setup_tri_coefficients( struct setup_context *setup,
static void setup_tri_coefficients( struct lp_setup_context *setup,
struct lp_rast_triangle *tri,
float oneoverarea,
const float (*v1)[4],
......@@ -274,7 +274,7 @@ alloc_triangle(struct lp_scene *scene, unsigned nr_inputs, unsigned *tri_size)
* bins for the tiles which we overlap.
*/
static void
do_triangle_ccw(struct setup_context *setup,
do_triangle_ccw(struct lp_setup_context *setup,
const float (*v1)[4],
const float (*v2)[4],
const float (*v3)[4],
......@@ -565,7 +565,7 @@ do_triangle_ccw(struct setup_context *setup,
}
static void triangle_cw( struct setup_context *setup,
static void triangle_cw( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4],
const float (*v2)[4] )
......@@ -574,7 +574,7 @@ static void triangle_cw( struct setup_context *setup,
}
static void triangle_ccw( struct setup_context *setup,
static void triangle_ccw( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4],
const float (*v2)[4] )
......@@ -583,7 +583,7 @@ static void triangle_ccw( struct setup_context *setup,
}
static void triangle_both( struct setup_context *setup,
static void triangle_both( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4],
const float (*v2)[4] )
......@@ -602,7 +602,7 @@ static void triangle_both( struct setup_context *setup,
}
static void triangle_nop( struct setup_context *setup,
static void triangle_nop( struct lp_setup_context *setup,
const float (*v0)[4],
const float (*v1)[4],
const float (*v2)[4] )
......@@ -611,7 +611,7 @@ static void triangle_nop( struct setup_context *setup,
void
lp_setup_choose_triangle( struct setup_context *setup )
lp_setup_choose_triangle( struct lp_setup_context *setup )
{
switch (setup->cullmode) {
case PIPE_WINDING_NONE:
......
......@@ -48,10 +48,10 @@
/** cast wrapper */
static struct setup_context *
setup_context(struct vbuf_render *vbr)
static struct lp_setup_context *
lp_setup_context(struct vbuf_render *vbr)
{
return (struct setup_context *) vbr;
return (struct lp_setup_context *) vbr;
}
......@@ -59,7 +59,7 @@ setup_context(struct vbuf_render *vbr)
static const struct vertex_info *
lp_setup_get_vertex_info(struct vbuf_render *vbr)
{
struct setup_context *setup = setup_context(vbr);
struct lp_setup_context *setup = lp_setup_context(vbr);
return setup->vertex_info;
}
......@@ -68,7 +68,7 @@ static boolean
lp_setup_allocate_vertices(struct vbuf_render *vbr,
ushort vertex_size, ushort nr_vertices)
{
struct setup_context *setup = setup_context(vbr);
struct lp_setup_context *setup = lp_setup_context(vbr);
unsigned size = vertex_size * nr_vertices;
if (setup->vertex_buffer_size < size) {
......@@ -92,7 +92,7 @@ lp_setup_release_vertices(struct vbuf_render *vbr)
static void *
lp_setup_map_vertices(struct vbuf_render *vbr)
{
struct setup_context *setup = setup_context(vbr);
struct lp_setup_context *setup = lp_setup_context(vbr);
return setup->vertex_buffer;
}
......@@ -101,7 +101,7 @@ lp_setup_unmap_vertices(struct vbuf_render *vbr,
ushort min_index,
ushort max_index )
{
struct setup_context *setup = setup_context(vbr);
struct lp_setup_context *setup = lp_setup_context(vbr);
assert( setup->vertex_buffer_size >= (max_index+1) * setup->vertex_size );
/* do nothing */
}
......@@ -110,7 +110,7 @@ lp_setup_unmap_vertices(struct vbuf_render *vbr,
static boolean
lp_setup_set_primitive(struct vbuf_render *vbr, unsigned prim)
{
setup_context(vbr)->prim = prim;
lp_setup_context(vbr)->prim = prim;
return TRUE;
}
......@@ -129,7 +129,7 @@ static INLINE const_float4_ptr get_vert( const void *vertex_buffer,
static void
lp_setup_draw(struct vbuf_render *vbr, const ushort *indices, uint nr)
{
struct setup_context *setup = setup_context(vbr);
struct lp_setup_context *setup = lp_setup_context(vbr);
const unsigned stride = setup->vertex_info->size * sizeof(float);
const void *vertex_buffer = setup->vertex_buffer;
unsigned i;
......@@ -284,7 +284,7 @@ lp_setup_draw(struct vbuf_render *vbr, const ushort *indices, uint nr)
static void
lp_setup_draw_arrays(struct vbuf_render *vbr, uint start, uint nr)
{
struct setup_context *setup = setup_context(vbr);
struct lp_setup_context *setup = lp_setup_context(vbr);
const unsigned stride = setup->vertex_info->size * sizeof(float);
const void *vertex_buffer =
(void *) get_vert(setup->vertex_buffer, start, stride);
......@@ -436,7 +436,7 @@ lp_setup_draw_arrays(struct vbuf_render *vbr, uint start, uint nr)
static void
lp_setup_vbuf_destroy(struct vbuf_render *vbr)
{
lp_setup_destroy(setup_context(vbr));
lp_setup_destroy(lp_setup_context(vbr));
}
......@@ -444,7 +444,7 @@ lp_setup_vbuf_destroy(struct vbuf_render *vbr)
* Create the post-transform vertex handler for the given context.
*/
void
lp_setup_init_vbuf(struct setup_context *setup)
lp_setup_init_vbuf(struct lp_setup_context *setup)
{
setup->base.max_indices = LP_MAX_VBUF_INDEXES;
setup->base.max_vertex_buffer_bytes = LP_MAX_VBUF_SIZE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment