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

i965: drop brw->has_llc in favor of devinfo->has_llc

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Lionel Landwerlin 2017-08-30 09:29:11 +01:00
parent 27e273578f
commit a5f0821485
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -858,7 +858,6 @@ brwCreateContext(gl_api api,
brw->screen = screen;
brw->bufmgr = screen->bufmgr;
brw->has_llc = devinfo->has_llc;
brw->has_hiz = devinfo->has_hiz_and_separate_stencil;
brw->has_separate_stencil = devinfo->has_hiz_and_separate_stencil;
brw->has_pln = devinfo->has_pln;

1
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -749,7 +749,6 @@ struct brw_context
bool has_hiz;
bool has_separate_stencil;
bool must_use_separate_stencil;
bool has_llc;
bool has_swizzling;
bool has_surface_tile_offset;
bool has_compr4;

6
src/mesa/drivers/dri/i965/intel_batchbuffer.c
View file

@ -178,7 +178,9 @@ intel_batchbuffer_reset(struct intel_batchbuffer *batch,
static void
intel_batchbuffer_reset_and_clear_render_cache(struct brw_context *brw)
{
intel_batchbuffer_reset(&brw->batch, brw->bufmgr, brw->has_llc);
const struct gen_device_info *devinfo = &brw->screen->devinfo;
intel_batchbuffer_reset(&brw->batch, brw->bufmgr, devinfo->has_llc);
brw_render_cache_set_clear(brw);
}
@ -634,7 +636,7 @@ do_flush_locked(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)
struct intel_batchbuffer *batch = &brw->batch;
int ret = 0;
if (brw->has_llc) {
if (devinfo->has_llc) {
brw_bo_unmap(batch->bo);
} else {
ret = brw_bo_subdata(batch->bo, 0, 4 * USED_BATCH(*batch), batch->map);

2
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -3573,7 +3573,7 @@ use_intel_mipree_map_blit(struct brw_context *brw,
{
const struct gen_device_info *devinfo = &brw->screen->devinfo;
if (brw->has_llc &&
if (devinfo->has_llc &&
/* It's probably not worth swapping to the blit ring because of
* all the overhead involved.
*/

2
src/mesa/drivers/dri/i965/intel_pixel_read.c
View file

@ -92,7 +92,7 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx,
* a 2D BGRA, RGBA, L8 or A8 texture. It could be generalized to support
* more types.
*/
if (!brw->has_llc ||
if (!devinfo->has_llc ||
!(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) ||
pixels == NULL ||
_mesa_is_bufferobj(pack->BufferObj) ||

2
src/mesa/drivers/dri/i965/intel_tex_image.c
View file

@ -401,7 +401,7 @@ intel_gettexsubimage_tiled_memcpy(struct gl_context *ctx,
* with _mesa_image_row_stride. However, before removing the restrictions
* we need tests.
*/
if (!brw->has_llc ||
if (!devinfo->has_llc ||
!(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) ||
!(texImage->TexObject->Target == GL_TEXTURE_2D ||
texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||

2
src/mesa/drivers/dri/i965/intel_tex_subimage.c
View file

@ -99,7 +99,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
* with _mesa_image_row_stride. However, before removing the restrictions
* we need tests.
*/
if (!brw->has_llc ||
if (!devinfo->has_llc ||
!(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) ||
!(texImage->TexObject->Target == GL_TEXTURE_2D ||
texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||