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

Revert "u_vbuf: Regard non-constant vbufs with non-instance elements as free" 

This reverts commit c6ef79c488.

It broke torcs.
This commit is contained in:
Marek Olšák 2019-12-30 18:41:04 -05:00
parent 3909b16000
commit 5c9dcbea77
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gallium/auxiliary/util/u_vbuf.c
View File

@ -538,15 +538,14 @@ u_vbuf_translate_buffers(struct u_vbuf *mgr, struct translate_key *key,
static boolean
u_vbuf_translate_find_free_vb_slots(struct u_vbuf *mgr,
unsigned mask[VB_NUM],
unsigned extra_free_vb_mask)
unsigned mask[VB_NUM])
{
unsigned type;
unsigned fallback_vbs[VB_NUM];
/* Set the bit for each buffer which is incompatible, or isn't set. */
uint32_t unused_vb_mask =
(mgr->ve->incompatible_vb_mask_all | mgr->incompatible_vb_mask |
~mgr->enabled_vb_mask | extra_free_vb_mask) & mgr->allowed_vb_mask;
mgr->ve->incompatible_vb_mask_all | mgr->incompatible_vb_mask |
~mgr->enabled_vb_mask;
uint32_t unused_vb_mask_orig;
boolean insufficient_buffers = false;
@ -607,7 +606,6 @@ u_vbuf_translate_begin(struct u_vbuf *mgr,
unsigned i, type;
const unsigned incompatible_vb_mask = mgr->incompatible_vb_mask &
mgr->ve->used_vb_mask;
unsigned extra_free_vb_mask = 0;
const int start[VB_NUM] = {
start_vertex, /* VERTEX */
@ -653,15 +651,8 @@ u_vbuf_translate_begin(struct u_vbuf *mgr,
assert(mask[VB_VERTEX] || mask[VB_INSTANCE] || mask[VB_CONST]);
/* In the case of unroll_indices, we can regard all non-constant
* vertex buffers with only non-instance vertex elements as incompatible
* and thus free.
*/
if (unroll_indices)
extra_free_vb_mask = mask[VB_VERTEX] & ~mask[VB_INSTANCE];
/* Find free vertex buffer slots. */
if (!u_vbuf_translate_find_free_vb_slots(mgr, mask, extra_free_vb_mask)) {
if (!u_vbuf_translate_find_free_vb_slots(mgr, mask)) {
return FALSE;
}