浏览代码

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

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>
tags/17.3-branchpoint
Lionel Landwerlin 8 年前
父节点
当前提交
a5f0821485

+ 0
- 1
src/mesa/drivers/dri/i965/brw_context.c 查看文件

@@ -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;

+ 0
- 1
src/mesa/drivers/dri/i965/brw_context.h 查看文件

@@ -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;

+ 4
- 2
src/mesa/drivers/dri/i965/intel_batchbuffer.c 查看文件

@@ -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);

+ 1
- 1
src/mesa/drivers/dri/i965/intel_mipmap_tree.c 查看文件

@@ -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.
*/

+ 1
- 1
src/mesa/drivers/dri/i965/intel_pixel_read.c 查看文件

@@ -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) ||

+ 1
- 1
src/mesa/drivers/dri/i965/intel_tex_image.c 查看文件

@@ -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) ||

+ 1
- 1
src/mesa/drivers/dri/i965/intel_tex_subimage.c 查看文件

@@ -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) ||

正在加载...
取消
保存