projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ilo: fix scratch space setup in core
[mesa.git]
/
src
/
gallium
/
drivers
/
ilo
/
ilo_render_gen8.c
diff --git
a/src/gallium/drivers/ilo/ilo_render_gen8.c
b/src/gallium/drivers/ilo/ilo_render_gen8.c
index 4c1c08bbd25a957bef55a465bd628d5651f14344..1f750a2bfed50342a624a6aa956c9bf106665f1c 100644
(file)
--- a/
src/gallium/drivers/ilo/ilo_render_gen8.c
+++ b/
src/gallium/drivers/ilo/ilo_render_gen8.c
@@
-30,6
+30,7
@@
#include "core/ilo_builder_render.h"
#include "ilo_blitter.h"
#include "core/ilo_builder_render.h"
#include "ilo_blitter.h"
+#include "ilo_resource.h"
#include "ilo_shader.h"
#include "ilo_state.h"
#include "ilo_render_gen.h"
#include "ilo_shader.h"
#include "ilo_state.h"
#include "ilo_render_gen.h"
@@
-124,7
+125,7
@@
gen8_draw_wm(struct ilo_render *r,
/* 3DSTATE_PS */
if (DIRTY(FS) || r->instruction_bo_changed)
/* 3DSTATE_PS */
if (DIRTY(FS) || r->instruction_bo_changed)
- gen8_3DSTATE_PS(r->builder, &cso->ps, kernel_offset);
+ gen8_3DSTATE_PS(r->builder, &cso->ps, kernel_offset
, NULL
);
/* 3DSTATE_PS_EXTRA */
if (DIRTY(FS))
/* 3DSTATE_PS_EXTRA */
if (DIRTY(FS))
@@
-202,7
+203,7
@@
gen8_draw_vf(struct ilo_render *r,
/* 3DSTATE_INDEX_BUFFER */
if ((session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_INDEX_BUFFER) ||
DIRTY(IB) || r->batch_bo_changed)
/* 3DSTATE_INDEX_BUFFER */
if ((session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_INDEX_BUFFER) ||
DIRTY(IB) || r->batch_bo_changed)
- gen8_3DSTATE_INDEX_BUFFER(r->builder, &vec->ve->vf, &vec->ib);
+ gen8_3DSTATE_INDEX_BUFFER(r->builder, &vec->ve->vf, &vec->ib
.ib
);
/* 3DSTATE_VF */
if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VF)
/* 3DSTATE_VF */
if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VF)
@@
-219,8
+220,7
@@
gen8_draw_vf(struct ilo_render *r,
if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VERTEX_ELEMENTS)
gen6_3DSTATE_VERTEX_ELEMENTS(r->builder, &vec->ve->vf);
if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VERTEX_ELEMENTS)
gen6_3DSTATE_VERTEX_ELEMENTS(r->builder, &vec->ve->vf);
- gen8_3DSTATE_VF_TOPOLOGY(r->builder,
- gen6_3d_translate_pipe_prim(vec->draw->mode));
+ gen8_3DSTATE_VF_TOPOLOGY(r->builder, vec->draw_info.topology);
if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VF_INSTANCING) {
const uint8_t attr_count = ilo_state_vf_get_attr_count(&vec->ve->vf);
if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VF_INSTANCING) {
const uint8_t attr_count = ilo_state_vf_get_attr_count(&vec->ve->vf);
@@
-269,7
+269,7
@@
ilo_render_emit_draw_commands_gen8(struct ilo_render *render,
gen6_draw_sf_rect(render, vec, session);
gen8_draw_vf(render, vec, session);
gen6_draw_sf_rect(render, vec, session);
gen8_draw_vf(render, vec, session);
- ilo_render_3dprimitive(render,
vec->draw, &vec->ib
);
+ ilo_render_3dprimitive(render,
&vec->draw_info
);
}
int
}
int