浏览代码

intel: Skip texsubimage fastpath for more pixel unpack state (v2)

Fixes piglit tests "unpack-teximage2d --pbo=* --format=GL_BGRA" on
Sandybridge+.

The fastpath was checking an incomplete set of pixel unpack state. This
patch adds checks for all the fields of gl_pixelstore_attrib that affect
2D texture uploads.  Also, it begins permitting the case where
GL_UNPACK_ROW_LENGTH is 0.

Ideally, we would just ask a unicorn to JIT this fastpath for us in
a way that safely handles the unpacking state. Until then, it's safer if
only a small set of situations activate the fastpath.

v2: Use _mesa_is_bufferobj(), per Anholt.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
tags/gles3-fmt-v1
Chad Versace 13 年前
父节点
当前提交
0da72d3502
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6
    1
      src/mesa/drivers/dri/intel/intel_tex_subimage.c

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

@@ -26,6 +26,7 @@
*
**************************************************************************/

#include "main/bufferobj.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/pbo.h"
@@ -205,10 +206,14 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
texImage->TexObject->Target != GL_TEXTURE_2D ||
texImage->Level != 0 ||
pixels == NULL ||
_mesa_is_bufferobj(packing->BufferObj) ||
packing->Alignment > 4 ||
packing->SkipPixels > 0 ||
packing->SkipRows > 0 ||
packing->RowLength != width)
(packing->RowLength != 0 && packing->RowLength != width) ||
packing->SwapBytes ||
packing->LsbFirst ||
packing->Invert)
return false;

if (for_glTexImage)

正在加载...
取消
保存