KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Trivial formatting changes in brw_draw.c 

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
This commit is contained in:
Ian Romanick 2015-06-18 18:45:44 -07:00
parent 2b81cefb3f
commit 5b6218395c
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/mesa/drivers/dri/i965/brw_draw.c
View File

@ -104,8 +104,8 @@ get_hw_prim_for_gl_prim(int mode)
* programs be immune to the active primitive (ie. cope with all
* possibilities). That may not be realistic however.
*/
static void brw_set_prim(struct brw_context *brw,
const struct _mesa_prim *prim)
static void
brw_set_prim(struct brw_context *brw, const struct _mesa_prim *prim)
{
struct gl_context *ctx = &brw->ctx;
uint32_t hw_prim = get_hw_prim_for_gl_prim(prim->mode);
@ -138,15 +138,12 @@ static void brw_set_prim(struct brw_context *brw,
}
}
static void gen6_set_prim(struct brw_context *brw,
const struct _mesa_prim *prim)
static void
gen6_set_prim(struct brw_context *brw, const struct _mesa_prim *prim)
{
uint32_t hw_prim;
DBG("PRIM: %s\n", _mesa_enum_to_string(prim->mode));
hw_prim = get_hw_prim_for_gl_prim(prim->mode);
const uint32_t hw_prim = get_hw_prim_for_gl_prim(prim->mode);
if (hw_prim != brw->primitive) {
brw->primitive = hw_prim;
brw->ctx.NewDriverState |= BRW_NEW_PRIMITIVE;
@ -162,7 +159,8 @@ static void gen6_set_prim(struct brw_context *brw,
* quads so that those dangling vertices won't get drawn when we convert to
* trifans/tristrips.
*/
static GLuint trim(GLenum prim, GLuint length)
static GLuint
trim(GLenum prim, GLuint length)
{
if (prim == GL_QUAD_STRIP)
return length > 3 ? (length - length % 2) : 0;
@ -173,14 +171,14 @@ static GLuint trim(GLenum prim, GLuint length)
}
static void brw_emit_prim(struct brw_context *brw,
const struct _mesa_prim *prim,
uint32_t hw_prim)
static void
brw_emit_prim(struct brw_context *brw,
const struct _mesa_prim *prim,
uint32_t hw_prim)
{
int verts_per_instance;
int vertex_access_type;
int indirect_flag;
int predicate_enable;
DBG("PRIM: %s %d %d\n", _mesa_enum_to_string(prim->mode),
prim->start, prim->count);
@ -216,9 +214,8 @@ static void brw_emit_prim(struct brw_context *brw,
* and missed flushes of the render cache as it heads to other parts of
* the besides the draw code.
*/
if (brw->always_flush_cache) {
if (brw->always_flush_cache)
brw_emit_mi_flush(brw);
}
/* If indirect, emit a bunch of loads from the indirect BO. */
if (prim->is_indirect) {
@ -256,18 +253,16 @@ static void brw_emit_prim(struct brw_context *brw,
OUT_BATCH(0);
ADVANCE_BATCH();
}
}
else {
} else {
indirect_flag = 0;
}
BEGIN_BATCH(brw->gen >= 7 ? 7 : 6);
if (brw->gen >= 7) {
if (brw->predicate.state == BRW_PREDICATE_STATE_USE_BIT)
predicate_enable = GEN7_3DPRIM_PREDICATE_ENABLE;
else
predicate_enable = 0;
const int predicate_enable =
(brw->predicate.state == BRW_PREDICATE_STATE_USE_BIT)
? GEN7_3DPRIM_PREDICATE_ENABLE : 0;
OUT_BATCH(CMD_3D_PRIM << 16 | (7 - 2) | indirect_flag | predicate_enable);
OUT_BATCH(hw_prim | vertex_access_type);
@ -283,14 +278,14 @@ static void brw_emit_prim(struct brw_context *brw,
OUT_BATCH(base_vertex_location);
ADVANCE_BATCH();
if (brw->always_flush_cache) {
if (brw->always_flush_cache)
brw_emit_mi_flush(brw);
}
}
static void brw_merge_inputs( struct brw_context *brw,
const struct gl_client_array *arrays[])
static void
brw_merge_inputs(struct brw_context *brw,
const struct gl_client_array *arrays[])
{
const struct gl_context *ctx = &brw->ctx;
GLuint i;
@ -359,7 +354,8 @@ static void brw_merge_inputs( struct brw_context *brw,
* Also mark any render targets which will be textured as needing a render
* cache flush.
*/
static void brw_postdraw_set_buffers_need_resolve(struct brw_context *brw)
static void
brw_postdraw_set_buffers_need_resolve(struct brw_context *brw)
{
struct gl_context *ctx = &brw->ctx;
struct gl_framebuffer *fb = ctx->DrawBuffer;
@ -399,21 +395,22 @@ static void brw_postdraw_set_buffers_need_resolve(struct brw_context *brw)
/* May fail if out of video memory for texture or vbo upload, or on
* fallback conditions.
*/
static void brw_try_draw_prims( struct gl_context *ctx,
const struct gl_client_array *arrays[],
const struct _mesa_prim *prims,
GLuint nr_prims,
const struct _mesa_index_buffer *ib,
GLuint min_index,
GLuint max_index,
struct gl_buffer_object *indirect)
static void
brw_try_draw_prims(struct gl_context *ctx,
const struct gl_client_array *arrays[],
const struct _mesa_prim *prims,
GLuint nr_prims,
const struct _mesa_index_buffer *ib,
GLuint min_index,
GLuint max_index,
struct gl_buffer_object *indirect)
{
struct brw_context *brw = brw_context(ctx);
GLuint i;
bool fail_next = false;
if (ctx->NewState)
_mesa_update_state( ctx );
_mesa_update_state(ctx);
/* Find the highest sampler unit used by each shader program. A bit-count
* won't work since ARB programs use the texture unit number as the sampler
@ -433,7 +430,7 @@ static void brw_try_draw_prims( struct gl_context *ctx,
* software fallback will segfault if it attempts to access any
* texture level other than level 0.
*/
brw_validate_textures( brw );
brw_validate_textures(brw);
intel_prepare_render(brw);
@ -445,7 +442,7 @@ static void brw_try_draw_prims( struct gl_context *ctx,
/* Bind all inputs, derive varying and size information:
*/
brw_merge_inputs( brw, arrays );
brw_merge_inputs(brw, arrays);
brw->ib.ib = ib;
brw->ctx.NewDriverState |= BRW_NEW_INDICES;
@ -553,15 +550,16 @@ retry:
return;
}
void brw_draw_prims( struct gl_context *ctx,
const struct _mesa_prim *prims,
GLuint nr_prims,
const struct _mesa_index_buffer *ib,
GLboolean index_bounds_valid,
GLuint min_index,
GLuint max_index,
struct gl_transform_feedback_object *unused_tfb_object,
struct gl_buffer_object *indirect )
void
brw_draw_prims(struct gl_context *ctx,
const struct _mesa_prim *prims,
GLuint nr_prims,
const struct _mesa_index_buffer *ib,
GLboolean index_bounds_valid,
GLuint min_index,
GLuint max_index,
struct gl_transform_feedback_object *unused_tfb_object,
struct gl_buffer_object *indirect)
{
struct brw_context *brw = brw_context(ctx);
const struct gl_client_array **arrays = ctx->Array._DrawArrays;
@ -604,26 +602,28 @@ void brw_draw_prims( struct gl_context *ctx,
* manage it. swrast doesn't support our featureset, so we can't fall back
* to it.
*/
brw_try_draw_prims(ctx, arrays, prims, nr_prims, ib, min_index, max_index, indirect);
brw_try_draw_prims(ctx, arrays, prims, nr_prims, ib, min_index, max_index,
indirect);
}
void brw_draw_init( struct brw_context *brw )
void
brw_draw_init(struct brw_context *brw)
{
struct gl_context *ctx = &brw->ctx;
struct vbo_context *vbo = vbo_context(ctx);
int i;
/* Register our drawing function:
*/
vbo->draw_prims = brw_draw_prims;
for (i = 0; i < VERT_ATTRIB_MAX; i++)
for (int i = 0; i < VERT_ATTRIB_MAX; i++)
brw->vb.inputs[i].buffer = -1;
brw->vb.nr_buffers = 0;
brw->vb.nr_enabled = 0;
}
void brw_draw_destroy( struct brw_context *brw )
void
brw_draw_destroy(struct brw_context *brw)
{
int i;