fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-18 05:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

u_vbuf_mgr: remove unused flag U_VBUF_UPLOAD_FLUSHED

Browse source 
(cherry picked from commit 315300e444)
This commit is contained in:
Marek Olšák 2011-09-25 19:31:15 +02:00
parent 060e22c212
commit eb2a04b467
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/auxiliary/util/u_vbuf_mgr.c
View file

@ -154,7 +154,7 @@ void u_vbuf_destroy(struct u_vbuf_mgr *mgrb)
}
static enum u_vbuf_return_flags
static void
u_vbuf_translate_begin(struct u_vbuf_priv *mgr,
int min_index, int max_index)
{
@ -311,8 +311,6 @@ u_vbuf_translate_begin(struct u_vbuf_priv *mgr,
}
pipe_resource_reference(&out_buffer, NULL);
return upload_flushed ? U_VBUF_UPLOAD_FLUSHED : 0;
}
static void u_vbuf_translate_end(struct u_vbuf_priv *mgr)
@ -520,7 +518,7 @@ void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb,
mgr->b.nr_real_vertex_buffers = count;
}
static enum u_vbuf_return_flags
static void
u_vbuf_upload_buffers(struct u_vbuf_priv *mgr,
int min_index, int max_index,
unsigned instance_count)
@ -528,7 +526,6 @@ u_vbuf_upload_buffers(struct u_vbuf_priv *mgr,
unsigned i, nr = mgr->ve->count;
unsigned count = max_index + 1 - min_index;
boolean uploaded[PIPE_MAX_ATTRIBS] = {0};
enum u_vbuf_return_flags retval = 0;
for (i = 0; i < nr; i++) {
unsigned index = mgr->ve->ve[i].vertex_buffer_index;
@ -567,14 +564,10 @@ u_vbuf_upload_buffers(struct u_vbuf_priv *mgr,
mgr->b.real_vertex_buffer[index].buffer_offset -= first;
uploaded[index] = TRUE;
if (flushed)
retval |= U_VBUF_UPLOAD_FLUSHED;
} else {
assert(mgr->b.real_vertex_buffer[index].buffer);
}
}
return retval;
}
static void u_vbuf_compute_max_index(struct u_vbuf_priv *mgr)
@ -623,7 +616,6 @@ u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb,
{
struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb;
int min_index, max_index;
enum u_vbuf_return_flags retval = 0;
u_vbuf_compute_max_index(mgr);
@ -636,20 +628,14 @@ u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb,
/* Translate vertices with non-native layouts or formats. */
if (mgr->incompatible_vb_layout || mgr->ve->incompatible_layout) {
retval |= u_vbuf_translate_begin(mgr, min_index, max_index);
if (mgr->fallback_ve) {
retval |= U_VBUF_BUFFERS_UPDATED;
}
u_vbuf_translate_begin(mgr, min_index, max_index);
}
/* Upload user buffers. */
if (mgr->any_user_vbs) {
retval |= u_vbuf_upload_buffers(mgr, min_index, max_index,
info->instance_count);
retval |= U_VBUF_BUFFERS_UPDATED;
u_vbuf_upload_buffers(mgr, min_index, max_index, info->instance_count);
}
return retval;
return mgr->any_user_vbs || mgr->fallback_ve ? U_VBUF_BUFFERS_UPDATED : 0;
}
void u_vbuf_draw_end(struct u_vbuf_mgr *mgrb)

3
src/gallium/auxiliary/util/u_vbuf_mgr.h
View file

@ -79,8 +79,7 @@ enum u_fetch_alignment {
};
enum u_vbuf_return_flags {
U_VBUF_BUFFERS_UPDATED = 1,
U_VBUF_UPLOAD_FLUSHED = 2
U_VBUF_BUFFERS_UPDATED = 1
};