**********************************************************/
-#include "util/u_format.h"
#include "util/u_helpers.h"
#include "util/u_inlines.h"
#include "util/u_prim.h"
#include "util/u_prim_restart.h"
-#include "util/u_time.h"
-#include "util/u_upload_mgr.h"
-#include "indices/u_indices.h"
-#include "svga_hw_reg.h"
-#include "svga_cmd.h"
#include "svga_context.h"
-#include "svga_screen.h"
#include "svga_draw.h"
#include "svga_shader.h"
-#include "svga_state.h"
#include "svga_surface.h"
#include "svga_swtnl.h"
#include "svga_debug.h"
static enum pipe_error
-retry_draw_range_elements( struct svga_context *svga,
- struct pipe_resource *index_buffer,
- unsigned index_size,
- int index_bias,
- unsigned min_index,
- unsigned max_index,
- enum pipe_prim_type prim,
- unsigned start,
- unsigned count,
- unsigned start_instance,
- unsigned instance_count,
- boolean do_retry )
+retry_draw_range_elements(struct svga_context *svga,
+ const struct pipe_draw_info *info,
+ unsigned count)
{
- enum pipe_error ret = PIPE_OK;
+ enum pipe_error ret;
SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_DRAWELEMENTS);
- svga_hwtnl_set_fillmode(svga->hwtnl, svga->curr.rast->hw_fillmode);
-
- ret = svga_update_state( svga, SVGA_STATE_HW_DRAW );
- if (ret != PIPE_OK)
- goto retry;
-
- /** determine if flatshade is to be used after svga_update_state()
- * in case the fragment shader is changed.
- */
- svga_hwtnl_set_flatshade(svga->hwtnl,
- svga->curr.rast->templ.flatshade ||
- is_using_flat_shading(svga),
- svga->curr.rast->templ.flatshade_first);
-
- ret = svga_hwtnl_draw_range_elements( svga->hwtnl,
- index_buffer, index_size, index_bias,
- min_index, max_index,
- prim, start, count,
- start_instance, instance_count);
- if (ret != PIPE_OK)
- goto retry;
-
- goto done;
-
-retry:
- svga_context_flush( svga, NULL );
-
- if (do_retry)
- {
- ret = retry_draw_range_elements(svga,
- index_buffer, index_size, index_bias,
- min_index, max_index,
- prim, start, count,
- start_instance, instance_count, FALSE);
+ ret = svga_hwtnl_draw_range_elements(svga->hwtnl, info, count);
+ if (ret != PIPE_OK) {
+ svga_context_flush(svga, NULL);
+ ret = svga_hwtnl_draw_range_elements(svga->hwtnl, info, count);
}
-done:
+ assert (ret == PIPE_OK);
SVGA_STATS_TIME_POP(svga_sws(svga));
return ret;
}
static enum pipe_error
-retry_draw_arrays( struct svga_context *svga,
- enum pipe_prim_type prim, unsigned start, unsigned count,
- unsigned start_instance, unsigned instance_count,
- boolean do_retry )
+retry_draw_arrays(struct svga_context *svga,
+ enum pipe_prim_type prim, unsigned start, unsigned count,
+ unsigned start_instance, unsigned instance_count)
{
enum pipe_error ret;
SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_DRAWARRAYS);
- svga_hwtnl_set_fillmode(svga->hwtnl, svga->curr.rast->hw_fillmode);
-
- ret = svga_update_state( svga, SVGA_STATE_HW_DRAW );
- if (ret != PIPE_OK)
- goto retry;
-
- /** determine if flatshade is to be used after svga_update_state()
- * in case the fragment shader is changed.
- */
- svga_hwtnl_set_flatshade(svga->hwtnl,
- svga->curr.rast->templ.flatshade ||
- is_using_flat_shading(svga),
- svga->curr.rast->templ.flatshade_first);
-
- ret = svga_hwtnl_draw_arrays(svga->hwtnl, prim, start, count,
- start_instance, instance_count);
- if (ret != PIPE_OK)
- goto retry;
-
- goto done;
-
-retry:
- if (ret == PIPE_ERROR_OUT_OF_MEMORY && do_retry)
- {
- svga_context_flush( svga, NULL );
-
- ret = retry_draw_arrays(svga, prim, start, count,
- start_instance, instance_count,
- FALSE);
+ for (unsigned try = 0; try < 2; try++) {
+ ret = svga_hwtnl_draw_arrays(svga->hwtnl, prim, start, count,
+ start_instance, instance_count);
+ if (ret == PIPE_OK)
+ break;
+ svga_context_flush(svga, NULL);
}
-done:
SVGA_STATS_TIME_POP(svga_sws(svga));
return ret;
}
need_fallback_prim_restart(const struct svga_context *svga,
const struct pipe_draw_info *info)
{
- if (info->primitive_restart && info->indexed) {
+ if (info->primitive_restart && info->index_size) {
if (!svga_have_vgpu10(svga))
return TRUE;
else if (!svga->state.sw.need_swtnl) {
- if (svga->curr.ib.index_size == 1)
+ if (info->index_size == 1)
return TRUE; /* no device support for 1-byte indexes */
- else if (svga->curr.ib.index_size == 2)
+ else if (info->index_size == 2)
return info->restart_index != 0xffff;
else
return info->restart_index != 0xffffffff;
static void
svga_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
{
- struct svga_context *svga = svga_context( pipe );
- enum pipe_prim_type reduced_prim = u_reduced_prim( info->mode );
+ struct svga_context *svga = svga_context(pipe);
+ enum pipe_prim_type reduced_prim = u_reduced_prim(info->mode);
unsigned count = info->count;
enum pipe_error ret = 0;
boolean needed_swtnl;
svga->curr.rast->templ.cull_face == PIPE_FACE_FRONT_AND_BACK)
goto done;
- /* Upload a user index buffer. */
- struct pipe_index_buffer ibuffer_saved = {0};
- if (info->indexed && svga->curr.ib.user_buffer &&
- !util_save_and_upload_index_buffer(pipe, info, &svga->curr.ib,
- &ibuffer_saved)) {
- return;
- }
-
/*
* Mark currently bound target surfaces as dirty
* doesn't really matter if it is done before drawing.
if (need_fallback_prim_restart(svga, info)) {
enum pipe_error r;
- r = util_draw_vbo_without_prim_restart(pipe, &svga->curr.ib, info);
+ r = util_draw_vbo_without_prim_restart(pipe, info);
assert(r == PIPE_OK);
(void) r;
goto done;
}
- if (!u_trim_pipe_prim( info->mode, &count ))
+ if (!u_trim_pipe_prim(info->mode, &count))
goto done;
needed_swtnl = svga->state.sw.need_swtnl;
- svga_update_state_retry( svga, SVGA_STATE_NEED_SWTNL );
+ svga_update_state_retry(svga, SVGA_STATE_NEED_SWTNL);
if (svga->state.sw.need_swtnl) {
svga->hud.num_fallbacks++; /* for SVGA_QUERY_NUM_FALLBACKS */
}
/* Avoid leaking the previous hwtnl bias to swtnl */
- svga_hwtnl_set_index_bias( svga->hwtnl, 0 );
- ret = svga_swtnl_draw_vbo( svga, info );
+ svga_hwtnl_set_index_bias(svga->hwtnl, 0);
+ ret = svga_swtnl_draw_vbo(svga, info);
}
else {
- if (info->indexed && svga->curr.ib.buffer) {
- unsigned offset;
-
- assert(svga->curr.ib.offset % svga->curr.ib.index_size == 0);
- offset = svga->curr.ib.offset / svga->curr.ib.index_size;
-
- ret = retry_draw_range_elements( svga,
- svga->curr.ib.buffer,
- svga->curr.ib.index_size,
- info->index_bias,
- info->min_index,
- info->max_index,
- info->mode,
- info->start + offset,
- count,
- info->start_instance,
- info->instance_count,
- TRUE );
+ if (!svga_update_state_retry(svga, SVGA_STATE_HW_DRAW)) {
+ static const char *msg = "State update failed, skipping draw call";
+ debug_printf("%s\n", msg);
+ pipe_debug_message(&svga->debug.callback, INFO, "%s", msg);
+ goto done;
+ }
+ svga_hwtnl_set_fillmode(svga->hwtnl, svga->curr.rast->hw_fillmode);
+
+ /** determine if flatshade is to be used after svga_update_state()
+ * in case the fragment shader is changed.
+ */
+ svga_hwtnl_set_flatshade(svga->hwtnl,
+ svga->curr.rast->templ.flatshade ||
+ is_using_flat_shading(svga),
+ svga->curr.rast->templ.flatshade_first);
+
+ if (info->index_size) {
+ ret = retry_draw_range_elements(svga, info, count);
}
else {
ret = retry_draw_arrays(svga, info->mode, info->start, count,
- info->start_instance, info->instance_count,
- TRUE);
+ info->start_instance, info->instance_count);
}
}
(void)ret;
if (SVGA_DEBUG & DEBUG_FLUSH) {
- svga_hwtnl_flush_retry( svga );
+ svga_hwtnl_flush_retry(svga);
svga_context_flush(svga, NULL);
}
done:
- if (info->indexed && ibuffer_saved.user_buffer)
- pipe->set_index_buffer(pipe, &ibuffer_saved);
-
SVGA_STATS_TIME_POP(svga_sws(svga));
}
-void svga_init_draw_functions( struct svga_context *svga )
+void
+svga_init_draw_functions(struct svga_context *svga)
{
svga->pipe.draw_vbo = svga_draw_vbo;
}
projects / mesa.git / blobdiff