diff options
| author | Topi Pohjolainen <topi.pohjolainen@intel.com> | 2015-08-28 07:57:27 +0300 |
|---|---|---|
| committer | Topi Pohjolainen <topi.pohjolainen@intel.com> | 2015-10-26 14:31:34 +0200 |
| commit | a44198de3ba41978fdcc94f191bb00591c04aaee (patch) | |
| tree | 5b8f828362cbd49eeefda9850e994601f37ef66b | |
| parent | 5d7d9c67514894885dae52ef06d1c154bedd7d76 (diff) | |
dbg
| -rw-r--r-- | tests/fbo/fbo-depthstencil.c | 12 | ||||
| -rw-r--r-- | tests/texturing/copyteximage.c | 9 |
2 files changed, 18 insertions, 3 deletions
diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c index a4cdb7972..933b668e7 100644 --- a/tests/fbo/fbo-depthstencil.c +++ b/tests/fbo/fbo-depthstencil.c @@ -140,8 +140,10 @@ static void read_separately(GLfloat *depth, GLushort *stencil) { glReadPixels(0, 0, BUF_SIZE, BUF_SIZE, GL_DEPTH_COMPONENT, GL_FLOAT, depth); +#if 0 glReadPixels(0, 0, BUF_SIZE, BUF_SIZE, GL_STENCIL_INDEX, GL_UNSIGNED_SHORT, stencil); +#endif } static void read_24_8(GLfloat *depth, GLushort *stencil) @@ -211,13 +213,18 @@ static enum piglit_result compare(transfer_func read) if (fabs(depth[y*BUF_SIZE+x] - expected_depth) > 0.001) { failures++; +#if 0 if (failures < 20) { +#endif printf("Depth at %i,%i Expected: %f Observed: %f\n", x, y, expected_depth, depth[y*BUF_SIZE+x]); +#if 0 } else if (failures == 20) { printf("...\n"); } +#endif } +#if 0 if (stencil[y*BUF_SIZE+x] != expected_stencil) { failures++; if (failures < 20) { @@ -227,6 +234,7 @@ static enum piglit_result compare(transfer_func read) printf("...\n"); } } +#endif } } if (failures) @@ -348,7 +356,7 @@ static enum piglit_result test_copy(void) /* Clear. */ glClearDepth(0); glClearStencil(0xfefe); - glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + glClear(GL_DEPTH_BUFFER_BIT); /* Initialize buffers. */ glEnable(GL_DEPTH_TEST); @@ -362,7 +370,7 @@ static enum piglit_result test_copy(void) if (test == BLIT) glBlitFramebufferEXT(BUF_SIZE/2+1, BUF_SIZE/2+1, BUF_SIZE, BUF_SIZE, 0, 0, BUF_SIZE/2, BUF_SIZE/2, - GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT, GL_NEAREST); + GL_DEPTH_BUFFER_BIT, GL_NEAREST); else glCopyPixels(BUF_SIZE/2+1, BUF_SIZE/2+1, BUF_SIZE/2, BUF_SIZE/2, GL_DEPTH_STENCIL); diff --git a/tests/texturing/copyteximage.c b/tests/texturing/copyteximage.c index af65d5fdd..c9c7f8ae4 100644 --- a/tests/texturing/copyteximage.c +++ b/tests/texturing/copyteximage.c @@ -54,6 +54,7 @@ static const struct { GLenum format; const GLvoid *expected; } test_vectors[] = { +#if 0 { GL_RED, fcolor[0] }, { GL_RG, fcolor[1] }, @@ -87,9 +88,11 @@ static const struct { { GL_DEPTH_COMPONENT16, fcolor[7] }, { GL_DEPTH_COMPONENT24, fcolor[7] }, { GL_DEPTH_COMPONENT32F, fcolor[7] }, - +#endif { GL_DEPTH24_STENCIL8, fcolor[7] }, +#if 0 { GL_DEPTH32F_STENCIL8, fcolor[7] }, +#endif }; static const struct { @@ -98,13 +101,17 @@ static const struct { unsigned gl_version; const char *extension; } target[] = { +#if 0 {GL_TEXTURE_1D, "1D", 11, NULL}, +#endif {GL_TEXTURE_2D, "2D", 11, NULL}, +#if 0 {GL_TEXTURE_3D, "3D", 12, NULL}, {GL_TEXTURE_CUBE_MAP, "CUBE", 13, "GL_ARB_texture_cube_map"}, {GL_TEXTURE_1D_ARRAY, "1D_ARRAY", 30, "GL_EXT_texture_array"}, {GL_TEXTURE_2D_ARRAY, "2D_ARRAY", 30, "GL_EXT_texture_array"}, {GL_TEXTURE_RECTANGLE, "RECT", 31, "GL_ARB_texture_rectangle"} +#endif }; static int test_target = -1; |