AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Modify sample buffer size for larger displays."

Browse Source 
This reverts commit dd72f3bd0d500b9b3f900bcb8e904161ee51eae5.

git-svn-id: http://skia.googlecode.com/svn/trunk@14827 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2014-05-21 16:38:43 +00:00
parent eeef0cc49b
commit b03be0b887
3 changed files with 5 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
expectations/gm/ignored-tests.txt
View File

@ -51,63 +51,4 @@ simpleblurroundrect
downsamplebitmap_checkerboard_high_512_256
downsamplebitmap_image_high_mandrill_512.png
filterbitmap_checkerboard_192_192
downsamplebitmap_text_high_72.00pt
# https://codereview.chromium.org/240433002/
# scroggo will rebaseline this test
shadertext3_8888
shadertext3_565
pictureshader_8888
pictureshader_565
giantbitmap_mirror_bilerp_rotate_8888
giantbitmap_mirror_bilerp_rotate_565
giantbitmap_repeat_bilerp_rotate_8888
giantbitmap_repeat_bilerp_rotate_565
filterbitmap_image_mandrill_512.png_8888
filterbitmap_image_mandrill_512.png_565
filterbitmap_image_mandrill_256.png_8888
filterbitmap_image_mandrill_256.png_565
filterbitmap_image_mandrill_128.png_8888
filterbitmap_image_mandrill_128.png_565
filterbitmap_image_mandrill_64.png_8888
filterbitmap_image_mandrill_64.png_565
filterbitmap_image_mandrill_32.png_8888
filterbitmap_image_mandrill_32.png_565
filterbitmap_image_mandrill_16.png_8888
filterbitmap_image_mandrill_16.png_565
filterbitmap_checkerboard_192_192_8888
filterbitmap_checkerboard_192_192_565
filterbitmap_checkerboard_32_2_8888
filterbitmap_checkerboard_32_2_565
filterbitmap_checkerboard_32_8_8888
filterbitmap_checkerboard_32_8_565
filterbitmap_checkerboard_32_32_8888
filterbitmap_checkerboard_32_32_565
filterbitmap_checkerboard_4_4_8888
filterbitmap_checkerboard_4_4_565
filterbitmap_text_10.00pt_8888
filterbitmap_text_10.00pt_565
filterbitmap_text_7.00pt_8888
filterbitmap_text_7.00pt_565
filterbitmap_text_3.00pt_8888
filterbitmap_text_3.00pt_565
downsamplebitmap_image_none_mandrill_512.png_8888
downsamplebitmap_image_none_mandrill_512.png_565
downsamplebitmap_checkerboard_none_512_256_8888
downsamplebitmap_checkerboard_none_512_256_565
downsamplebitmap_text_none_72.00pt_8888
downsamplebitmap_text_none_72.00pt_565
downsamplebitmap_image_low_mandrill_512.png_8888
downsamplebitmap_image_low_mandrill_512.png_565
downsamplebitmap_checkerboard_low_512_256_8888
downsamplebitmap_checkerboard_low_512_256_565
downsamplebitmap_text_low_72.00pt_8888
downsamplebitmap_text_low_72.00pt_565
downsamplebitmap_image_medium_mandrill_512.png_8888
downsamplebitmap_image_medium_mandrill_512.png_565
downsamplebitmap_checkerboard_medium_512_256_8888
downsamplebitmap_checkerboard_medium_512_256_565
downsamplebitmap_text_medium_72.00pt_8888
downsamplebitmap_text_medium_72.00pt_565
drawbitmapmatrix_8888
drawbitmapmatrix_565
downsamplebitmap_text_high_72.00pt

10
include/core/SkPostConfig.h
View File

@ -68,16 +68,6 @@
# endif
#endif
/**
* Used to align stack allocated variables/buffers.
* Different compilers have different ways to accomplish this.
*/
#if defined(_MSC_VER)
# define SK_ALIGN(x) __declspec(align(x))
#else
# define SK_ALIGN(x) __attribute__((aligned(x)))
#endif
#if !defined(SK_SUPPORT_GPU)
# define SK_SUPPORT_GPU 1
#endif

20
src/core/SkBitmapProcShader.cpp
View File

@ -183,21 +183,13 @@ SkBitmapProcShader::BitmapProcShaderContext::~BitmapProcShaderContext() {
fState->~SkBitmapProcState();
}
/* Defines the buffer size for sample pixel indexes, used in the sample proc function calls.
* If the operation is bigger than the buffer, it's split into multiple calls. This split is bad
* for the performance of SIMD optimizations.
* A display in portrait mode, with a width of 720 pixels, requires a buffer size of at least 721
* to run uninterrupted in the more basic operations.
* (Formula: Width + 1 for 'scale/translate with filter' procs.
* See description of SkBitmapProcState::maxCountForBufferSize for more information.)
*/
#define BUF_MAX 1081
#define BUF_MAX 128
#define TEST_BUFFER_OVERRITEx
#ifdef TEST_BUFFER_OVERRITE
#define TEST_BUFFER_EXTRA 32
#define TEST_PATTERN 0x88888888
#define TEST_PATTERN 0x88888888
#else
#define TEST_BUFFER_EXTRA 0
#endif
@ -210,9 +202,7 @@ void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan(int x, int y, SkPMCo
return;
}
// Align buffer to 16 bytes to enable more efficient SIMD optimizations.
uint32_t SK_ALIGN(16) buffer[BUF_MAX + TEST_BUFFER_EXTRA];
uint32_t buffer[BUF_MAX + TEST_BUFFER_EXTRA];
SkBitmapProcState::MatrixProc mproc = state.getMatrixProc();
SkBitmapProcState::SampleProc32 sproc = state.getSampleProc32();
int max = state.maxCountForBufferSize(sizeof(buffer[0]) * BUF_MAX);
@ -265,9 +255,7 @@ void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan16(int x, int y, uint
return;
}
// Align buffer to 16 bytes to enable more efficient SIMD optimizations.
uint32_t SK_ALIGN(16) buffer[BUF_MAX];
uint32_t buffer[BUF_MAX];
SkBitmapProcState::MatrixProc mproc = state.getMatrixProc();
SkBitmapProcState::SampleProc16 sproc = state.getSampleProc16();
int max = state.maxCountForBufferSize(sizeof(buffer));