*/
static const struct svga_tracked_state *hw_draw_state[] =
{
- &svga_hw_update_zero_stride,
&svga_hw_fs,
&svga_hw_vs,
&svga_hw_rss,
&svga_hw_tss_binding,
&svga_hw_clip_planes,
&svga_hw_vdecl,
- &svga_hw_fs_parameters,
- &svga_hw_vs_parameters,
+ &svga_hw_fs_constants,
+ &svga_hw_vs_constants,
NULL
};
-static int update_state( struct svga_context *svga,
- const struct svga_tracked_state *atoms[],
- unsigned *state )
+static enum pipe_error
+update_state(struct svga_context *svga,
+ const struct svga_tracked_state *atoms[],
+ unsigned *state)
{
boolean debug = TRUE;
- enum pipe_error ret = 0;
+ enum pipe_error ret = PIPE_OK;
unsigned i;
ret = svga_hwtnl_flush( svga->hwtnl );
- if (ret != 0)
+ if (ret != PIPE_OK)
return ret;
if (debug) {
if (0)
debug_printf("update: %s\n", atoms[i]->name);
ret = atoms[i]->update( svga, *state );
- if (ret != 0)
+ if (ret != PIPE_OK)
return ret;
}
for (i = 0; atoms[i] != NULL; i++) {
if (check_state(*state, atoms[i]->dirty)) {
ret = atoms[i]->update( svga, *state );
- if (ret != 0)
+ if (ret != PIPE_OK)
return ret;
}
}
}
- return 0;
+ return PIPE_OK;
}
-int svga_update_state( struct svga_context *svga,
- unsigned max_level )
+enum pipe_error
+svga_update_state(struct svga_context *svga, unsigned max_level)
{
struct svga_screen *screen = svga_screen(svga->pipe.screen);
- int ret = 0;
- int i;
+ enum pipe_error ret = PIPE_OK;
+ unsigned i;
/* Check for updates to bound textures. This can't be done in an
* atom as there is no flag which could provoke this test, and we
ret = update_state( svga,
state_levels[i],
&svga->dirty );
- if (ret != 0)
+ if (ret != PIPE_OK)
return ret;
svga->state.dirty[i] = 0;
svga->state.dirty[i] |= svga->dirty;
svga->dirty = 0;
- return 0;
+ return PIPE_OK;
}
void svga_update_state_retry( struct svga_context *svga,
unsigned max_level )
{
- int ret;
+ enum pipe_error ret;
ret = svga_update_state( svga, max_level );
ret = svga_update_state( svga, max_level );
}
- assert( ret == 0 );
+ assert( ret == PIPE_OK );
}
enum pipe_error ret;
ret = SVGA3D_BeginSetRenderState( svga->swc, &rs, COUNT );
- if (ret)
+ if (ret != PIPE_OK)
return ret;
/* Always use D3D style coordinate space as this is the only one
assert( COUNT == count );
SVGA_FIFOCommitAll( svga->swc );
- return 0;
-
+ return PIPE_OK;
}