[Piglit] [PATCH] arb_get_texture_sub_image: Remove unused allocations.
These allocations are never used and are also leaked when later allocations are assigned to the same pointers. Fixes Coverity "resource leak" defects. Signed-off-by: Vinson Lee --- tests/spec/arb_get_texture_sub_image/getcompressed.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/spec/arb_get_texture_sub_image/getcompressed.c b/tests/spec/arb_get_texture_sub_image/getcompressed.c index 63a722d..488cde9 100644 --- a/tests/spec/arb_get_texture_sub_image/getcompressed.c +++ b/tests/spec/arb_get_texture_sub_image/getcompressed.c @@ -40,10 +40,9 @@ test_getsubimage(GLenum target, GLsizei width, GLsizei height, GLsizei numSlices, GLenum intFormat) { - const GLint bufSize = width * height * 4 * sizeof(GLubyte); GLubyte *texData; - GLubyte *refData = malloc(6 * bufSize); /* 6 for cubemaps */ - GLubyte *testData = malloc(6 * bufSize); /* 6 for cubemaps */ + GLubyte *refData; + GLubyte *testData; GLuint tex; int i, slice, compressedSize, compSize; int blockWidth, blockHeight, blockSize; -- 2.6.3 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] sso: Check piglit_link_check_status return value.
Fixes Coverity "unchecked return value" defect. Signed-off-by: Vinson Lee --- tests/spec/arb_separate_shader_objects/active-sampler-conflict.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c b/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c index 0a91f49..1c94b43 100644 --- a/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c +++ b/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c @@ -124,7 +124,7 @@ setup_program(GLuint *prog, GLuint *pipe, GLuint *vao, *prog = glCreateShaderProgramv(GL_FRAGMENT_SHADER, 1, (const GLchar *const *) fs_code); - piglit_link_check_status(*prog); + pass = piglit_link_check_status(*prog) && pass; glGenProgramPipelines(1, pipe); glUseProgramStages(*pipe, -- 2.6.3 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] winsys-framework Default to showing window
On 09/11/15 05:19, Dave Airlie wrote: On 21 August 2015 at 22:08, Marek Olšák wrote: Hi Alex, The tests which don't specifically test the behavior of the default framebuffer should use -fbo. I think this is done by marking a test as "concurrent" in all.py. A lot of tests don't do that, because nobody had the time to update all.py and check if it doesn't break them and if it's okay to do that with regard to the purpose of the tests. (i.e. do they specifically test the default framebuffer or something else?) Just FYI classic swrast suffers from this issue, and since I added front buffer support to softpipe/llvmpipe they now also. We try to call XGetImage when no window has been mapped, and the X server correctly throws BadMatch. I'm not sure how to detect this is going to fail in this case, as I don't think inside libGL I can detect the unmapped front buffer. Dave. Dave, since you see a problem on swrast too, are you willing to give your R-b on this change? I guess this will force us to spend time on moving tests to using fbo, to speed things up and be less annoying, but we should not rely on unspecified behaviour anyway... Martin ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] winsys-framework Default to showing window
Hi Alex, You're right on the theory, but your patch seems to have an issue (read on). On 2015-08-13 19:49, agoins wrote: winsys-framework incorrectly assumed that it will always have ownership of the pixels in its own buffers. If using the default framebuffer (i.e., when Piglit is not running in FBO mode,) ownership will not be acquired unless the window is mapped. While this is not typically a problem because buffers are separate, NVIDIA's Unified Back Buffer feature makes all windows share a back buffer while still conforming to the OpenGL spec. If Piglit does not establish pixel ownership, its output will be clobbered by other windows. While this problem could be easily fixed by specifying PIGLIT_FORCE_WINDOW=1 or -fbo, the current default takes advantage of undefined behavior in the OpenGL spec. A better solution would be to replace PIGLIT_FORCE_WINDOW with PIGLIT_NO_WINDOW, a flag that allows tests to be run without mapping a window or using an FBO. The default behavior, the, would be to map a window. Really, though, if users want to test with offscreen rendering, they should use FBOs with flag -fbo. More information on pixel ownership here: https://www.opengl.org/documentation/specs/version1.1/glspec1.1/node94.html --- .../piglit-framework-gl/piglit_winsys_framework.c| 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c b/tests/util/piglit-framework-gl/piglit_winsys_framework.c index c80e972..fcba91e 100644 --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c @@ -53,18 +53,18 @@ run_test(struct piglit_gl_framework *gl_fw, int argc, char *argv[]) { struct piglit_winsys_framework *winsys_fw = piglit_winsys_framework(gl_fw); - bool force_window = false; - const char *env_force_window = getenv("PIGLIT_FORCE_WINDOW"); + bool no_window = false; + const char *env_no_window = getenv("PIGLIT_NO_WINDOW"); - if (env_force_window != NULL) { - if (strcmp(env_force_window, "0") == 0) { - force_window = false; - } else if (strcmp(env_force_window, "1") == 0) { - force_window = true; + if (env_no_window != NULL) { + if (strcmp(env_no_window, "0") == 0) { + no_window = true; + } else if (strcmp(env_no_window, "1") == 0) { + no_window = true; So no_window is set to TRUE if the variable is "0" and if it is "1". That doesn't seem right. Can you fix that? -- A. Huillet NVIDIA Linux graphics ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] arb_get_texture_sub_image: Remove unused allocations.
On 11/17/2015 01:07 AM, Vinson Lee wrote: These allocations are never used and are also leaked when later allocations are assigned to the same pointers. Fixes Coverity "resource leak" defects. Signed-off-by: Vinson Lee --- tests/spec/arb_get_texture_sub_image/getcompressed.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/spec/arb_get_texture_sub_image/getcompressed.c b/tests/spec/arb_get_texture_sub_image/getcompressed.c index 63a722d..488cde9 100644 --- a/tests/spec/arb_get_texture_sub_image/getcompressed.c +++ b/tests/spec/arb_get_texture_sub_image/getcompressed.c @@ -40,10 +40,9 @@ test_getsubimage(GLenum target, GLsizei width, GLsizei height, GLsizei numSlices, GLenum intFormat) { - const GLint bufSize = width * height * 4 * sizeof(GLubyte); GLubyte *texData; - GLubyte *refData = malloc(6 * bufSize); /* 6 for cubemaps */ - GLubyte *testData = malloc(6 * bufSize); /* 6 for cubemaps */ + GLubyte *refData; + GLubyte *testData; GLuint tex; int i, slice, compressedSize, compSize; int blockWidth, blockHeight, blockSize; Reviewed-by: Brian Paul ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
piglit_require_GLSL_version() requires an integer as parameter, not a float. This fixes an implicit conversion spotted by Clang. Signed-off-by: Samuel Pitoiset --- .../arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c index ff4b0e0..36b0a2d 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c @@ -115,7 +115,7 @@ piglit_init(int argc, char **argv) int i; /* Set up test */ - piglit_require_GLSL_version(1.50); + piglit_require_GLSL_version(150); piglit_require_transform_feedback(); piglit_require_extension("GL_ARB_gpu_shader_fp64"); -- 2.6.2 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 2/2] arb_compute_shader: fix too many arguments in call to 'confirm_size'
'local_x', 'local_y' and 'local_z' are declared as globals, and 'confirm_size' does not take any parameters. Spotted by Clang. Signed-off-by: Samuel Pitoiset --- tests/spec/arb_compute_shader/cs-ids-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_compute_shader/cs-ids-common.c b/tests/spec/arb_compute_shader/cs-ids-common.c index e05587f..9676c82 100644 --- a/tests/spec/arb_compute_shader/cs-ids-common.c +++ b/tests/spec/arb_compute_shader/cs-ids-common.c @@ -300,7 +300,7 @@ cs_ids_run_test() } glMemoryBarrier(GL_ALL_BARRIER_BITS); - result = confirm_size(local_x, local_y, local_z); + result = confirm_size(); if (result != PIGLIT_PASS) piglit_report_result(result); -- 2.6.2 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] winsys-framework Default to showing window
Woops, yeah, typo. Sure enough, the first one should be false. -Original Message- From: Arthur Huillet [mailto:arthur.huil...@free.fr] Sent: Tuesday, November 17, 2015 3:10 AM To: Alexander Goins Cc: piglit@lists.freedesktop.org; Arthur Huillet Subject: Re: [Piglit] [PATCH] winsys-framework Default to showing window Hi Alex, You're right on the theory, but your patch seems to have an issue (read on). On 2015-08-13 19:49, agoins wrote: > winsys-framework incorrectly assumed that it will always have > ownership of the pixels in its own buffers. If using the default > framebuffer (i.e., when Piglit is not running in FBO mode,) ownership > will not be acquired unless the window is mapped. > > While this is not typically a problem because buffers are separate, > NVIDIA's Unified Back Buffer feature makes all windows share a back > buffer while still conforming to the OpenGL spec. If Piglit does not > establish pixel ownership, its output will be clobbered by other > windows. > > While this problem could be easily fixed by specifying > PIGLIT_FORCE_WINDOW=1 or > -fbo, the current default takes advantage of undefined behavior in the > OpenGL spec. A better solution would be to replace PIGLIT_FORCE_WINDOW > with PIGLIT_NO_WINDOW, a flag that allows tests to be run without > mapping a window or using an FBO. The default behavior, the, would be > to map a window. > Really, > though, if users want to test with offscreen rendering, they should > use FBOs with flag -fbo. > > More information on pixel ownership here: > https://www.opengl.org/documentation/specs/version1.1/glspec1.1/node94 > .html > --- > .../piglit-framework-gl/piglit_winsys_framework.c| 20 > ++-- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c > b/tests/util/piglit-framework-gl/piglit_winsys_framework.c > index c80e972..fcba91e 100644 > --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c > +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c > @@ -53,18 +53,18 @@ run_test(struct piglit_gl_framework *gl_fw, > int argc, char *argv[]) > { > struct piglit_winsys_framework *winsys_fw = > piglit_winsys_framework(gl_fw); > - bool force_window = false; > - const char *env_force_window = getenv("PIGLIT_FORCE_WINDOW"); > + bool no_window = false; > + const char *env_no_window = getenv("PIGLIT_NO_WINDOW"); > > > - if (env_force_window != NULL) { > - if (strcmp(env_force_window, "0") == 0) { > - force_window = false; > - } else if (strcmp(env_force_window, "1") == 0) { > - force_window = true; > + if (env_no_window != NULL) { > + if (strcmp(env_no_window, "0") == 0) { > + no_window = true; > + } else if (strcmp(env_no_window, "1") == 0) { > + no_window = true; So no_window is set to TRUE if the variable is "0" and if it is "1". That doesn't seem right. Can you fix that? -- A. Huillet NVIDIA Linux graphics ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH v2] winsys-framework Default to showing window
From: agoins winsys-framework incorrectly assumed that it will always have ownership of the pixels in its own buffers. If using the default framebuffer (i.e., when Piglit is not running in FBO mode,) ownership will not be acquired unless the window is mapped. While this is not typically a problem because buffers are separate, NVIDIA's Unified Back Buffer feature makes all windows share a back buffer while still conforming to the OpenGL spec. If Piglit does not establish pixel ownership, its output will be clobbered by other windows. While this problem could be easily fixed by specifying PIGLIT_FORCE_WINDOW=1 or -fbo, the current default takes advantage of undefined behavior in the OpenGL spec. A better solution would be to replace PIGLIT_FORCE_WINDOW with PIGLIT_NO_WINDOW, a flag that allows tests to be run without mapping a window or using an FBO. The default behavior, the, would be to map a window. Really, though, if users want to test with offscreen rendering, they should use FBOs with flag -fbo. More information on pixel ownership here: https://www.opengl.org/documentation/specs/version1.1/glspec1.1/node94.html --- .../piglit-framework-gl/piglit_winsys_framework.c| 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c b/tests/util/piglit-framework-gl/piglit_winsys_framework.c index c80e972..ff3428a 100644 --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c @@ -53,18 +53,18 @@ run_test(struct piglit_gl_framework *gl_fw, int argc, char *argv[]) { struct piglit_winsys_framework *winsys_fw = piglit_winsys_framework(gl_fw); - bool force_window = false; - const char *env_force_window = getenv("PIGLIT_FORCE_WINDOW"); + bool no_window = false; + const char *env_no_window = getenv("PIGLIT_NO_WINDOW"); - if (env_force_window != NULL) { - if (strcmp(env_force_window, "0") == 0) { - force_window = false; - } else if (strcmp(env_force_window, "1") == 0) { - force_window = true; + if (env_no_window != NULL) { + if (strcmp(env_no_window, "0") == 0) { + no_window = false; + } else if (strcmp(env_no_window, "1") == 0) { + no_window = true; } else { - fprintf(stderr, "PIGLIT_FORCE_WINDOW has invalid" - " value: %s\n", env_force_window); + fprintf(stderr, "PIGLIT_NO_WINDOW has invalid" + " value: %s\n", env_no_window); abort(); } } @@ -73,7 +73,7 @@ run_test(struct piglit_gl_framework *gl_fw, gl_fw->test_config->init(argc, argv); if (!gl_fw->test_config->requires_displayed_window && - piglit_automatic && !force_window) { + piglit_automatic && no_window) { enum piglit_result result = PIGLIT_PASS; if (gl_fw->test_config->display) result = gl_fw->test_config->display(); -- 1.9.1 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH v2] winsys-framework Default to showing window
Thanks :) Reviewed by: Arthur Huillet On Tue, 17 Nov 2015 11:33:31 -0800 Alex Goins wrote: > From: agoins > > winsys-framework incorrectly assumed that it will always have ownership of the > pixels in its own buffers. If using the default framebuffer (i.e., when Piglit > is not running in FBO mode,) ownership will not be acquired unless the window > is > mapped. > > While this is not typically a problem because buffers are separate, NVIDIA's > Unified Back Buffer feature makes all windows share a back buffer while still > conforming to the OpenGL spec. If Piglit does not establish pixel ownership, > its > output will be clobbered by other windows. > > While this problem could be easily fixed by specifying PIGLIT_FORCE_WINDOW=1 > or > -fbo, the current default takes advantage of undefined behavior in the OpenGL > spec. A better solution would be to replace PIGLIT_FORCE_WINDOW with > PIGLIT_NO_WINDOW, a flag that allows tests to be run without mapping a window > or > using an FBO. The default behavior, the, would be to map a window. Really, > though, if users want to test with offscreen rendering, they should use FBOs > with flag -fbo. > > More information on pixel ownership here: > https://www.opengl.org/documentation/specs/version1.1/glspec1.1/node94.html > --- > .../piglit-framework-gl/piglit_winsys_framework.c| 20 > ++-- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c > b/tests/util/piglit-framework-gl/piglit_winsys_framework.c > index c80e972..ff3428a 100644 > --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c > +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c > @@ -53,18 +53,18 @@ run_test(struct piglit_gl_framework *gl_fw, > int argc, char *argv[]) > { > struct piglit_winsys_framework *winsys_fw = > piglit_winsys_framework(gl_fw); > - bool force_window = false; > - const char *env_force_window = getenv("PIGLIT_FORCE_WINDOW"); > + bool no_window = false; > + const char *env_no_window = getenv("PIGLIT_NO_WINDOW"); > > > - if (env_force_window != NULL) { > - if (strcmp(env_force_window, "0") == 0) { > - force_window = false; > - } else if (strcmp(env_force_window, "1") == 0) { > - force_window = true; > + if (env_no_window != NULL) { > + if (strcmp(env_no_window, "0") == 0) { > + no_window = false; > + } else if (strcmp(env_no_window, "1") == 0) { > + no_window = true; > } else { > - fprintf(stderr, "PIGLIT_FORCE_WINDOW has invalid" > - " value: %s\n", env_force_window); > + fprintf(stderr, "PIGLIT_NO_WINDOW has invalid" > + " value: %s\n", env_no_window); > abort(); > } > } > @@ -73,7 +73,7 @@ run_test(struct piglit_gl_framework *gl_fw, > gl_fw->test_config->init(argc, argv); > > if (!gl_fw->test_config->requires_displayed_window && > - piglit_automatic && !force_window) { > + piglit_automatic && no_window) { > enum piglit_result result = PIGLIT_PASS; > if (gl_fw->test_config->display) > result = gl_fw->test_config->display(); > -- > 1.9.1 > > > --- > This email message is for the sole use of the intended recipient(s) and may > contain > confidential information. Any unauthorized review, use, disclosure or > distribution > is prohibited. If you are not the intended recipient, please contact the > sender by > reply email and destroy all copies of the original message. > --- > -- Greetings, A. Huillet ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH v2] winsys-framework Default to showing window
On 18 November 2015 at 05:49, Arthur Huillet wrote: > Thanks :) > > Reviewed by: Arthur Huillet Reviewed-by: Dave Airlie > > On Tue, 17 Nov 2015 11:33:31 -0800 > Alex Goins wrote: > >> From: agoins >> >> winsys-framework incorrectly assumed that it will always have ownership of >> the >> pixels in its own buffers. If using the default framebuffer (i.e., when >> Piglit >> is not running in FBO mode,) ownership will not be acquired unless the >> window is >> mapped. >> >> While this is not typically a problem because buffers are separate, NVIDIA's >> Unified Back Buffer feature makes all windows share a back buffer while still >> conforming to the OpenGL spec. If Piglit does not establish pixel ownership, >> its >> output will be clobbered by other windows. >> >> While this problem could be easily fixed by specifying PIGLIT_FORCE_WINDOW=1 >> or >> -fbo, the current default takes advantage of undefined behavior in the OpenGL >> spec. A better solution would be to replace PIGLIT_FORCE_WINDOW with >> PIGLIT_NO_WINDOW, a flag that allows tests to be run without mapping a >> window or >> using an FBO. The default behavior, the, would be to map a window. Really, >> though, if users want to test with offscreen rendering, they should use FBOs >> with flag -fbo. >> >> More information on pixel ownership here: >> https://www.opengl.org/documentation/specs/version1.1/glspec1.1/node94.html >> --- >> .../piglit-framework-gl/piglit_winsys_framework.c| 20 >> ++-- >> 1 file changed, 10 insertions(+), 10 deletions(-) >> >> diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c >> b/tests/util/piglit-framework-gl/piglit_winsys_framework.c >> index c80e972..ff3428a 100644 >> --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c >> +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c >> @@ -53,18 +53,18 @@ run_test(struct piglit_gl_framework *gl_fw, >> int argc, char *argv[]) >> { >> struct piglit_winsys_framework *winsys_fw = >> piglit_winsys_framework(gl_fw); >> - bool force_window = false; >> - const char *env_force_window = getenv("PIGLIT_FORCE_WINDOW"); >> + bool no_window = false; >> + const char *env_no_window = getenv("PIGLIT_NO_WINDOW"); >> >> >> - if (env_force_window != NULL) { >> - if (strcmp(env_force_window, "0") == 0) { >> - force_window = false; >> - } else if (strcmp(env_force_window, "1") == 0) { >> - force_window = true; >> + if (env_no_window != NULL) { >> + if (strcmp(env_no_window, "0") == 0) { >> + no_window = false; >> + } else if (strcmp(env_no_window, "1") == 0) { >> + no_window = true; >> } else { >> - fprintf(stderr, "PIGLIT_FORCE_WINDOW has invalid" >> - " value: %s\n", env_force_window); >> + fprintf(stderr, "PIGLIT_NO_WINDOW has invalid" >> + " value: %s\n", env_no_window); >> abort(); >> } >> } >> @@ -73,7 +73,7 @@ run_test(struct piglit_gl_framework *gl_fw, >> gl_fw->test_config->init(argc, argv); >> >> if (!gl_fw->test_config->requires_displayed_window && >> - piglit_automatic && !force_window) { >> + piglit_automatic && no_window) { >> enum piglit_result result = PIGLIT_PASS; >> if (gl_fw->test_config->display) >> result = gl_fw->test_config->display(); >> -- >> 1.9.1 >> >> >> --- >> This email message is for the sole use of the intended recipient(s) and may >> contain >> confidential information. Any unauthorized review, use, disclosure or >> distribution >> is prohibited. If you are not the intended recipient, please contact the >> sender by >> reply email and destroy all copies of the original message. >> --- >> > > > -- > Greetings, > A. Huillet > ___ > Piglit mailing list > Piglit@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/piglit ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
On 18 November 2015 at 01:25, Samuel Pitoiset wrote: > piglit_require_GLSL_version() requires an integer as parameter, not a float. > This fixes an implicit conversion spotted by Clang. > > Signed-off-by: Samuel Pitoiset Reviewed-by: Dave Airlie > --- > .../arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c | 2 > +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > > b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > index ff4b0e0..36b0a2d 100644 > --- > a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > +++ > b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > @@ -115,7 +115,7 @@ piglit_init(int argc, char **argv) > int i; > > /* Set up test */ > - piglit_require_GLSL_version(1.50); > + piglit_require_GLSL_version(150); > piglit_require_transform_feedback(); > piglit_require_extension("GL_ARB_gpu_shader_fp64"); > > -- > 2.6.2 > > ___ > Piglit mailing list > Piglit@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/piglit ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
On Tue, Nov 17, 2015 at 04:25:53PM +0100, Samuel Pitoiset wrote: > piglit_require_GLSL_version() requires an integer as parameter, not a float. > This fixes an implicit conversion spotted by Clang. > > Signed-off-by: Samuel Pitoiset > --- > .../arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c | 2 > +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > > b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > index ff4b0e0..36b0a2d 100644 > --- > a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > +++ > b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c > @@ -115,7 +115,7 @@ piglit_init(int argc, char **argv) > int i; > > /* Set up test */ > - piglit_require_GLSL_version(1.50); > + piglit_require_GLSL_version(150); > piglit_require_transform_feedback(); > piglit_require_extension("GL_ARB_gpu_shader_fp64"); > > -- > 2.6.2 > > ___ > Piglit mailing list > Piglit@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/piglit Reviewed-by: Dylan Baker signature.asc Description: PGP signature ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] arb_separate_shader_objects: fix geometry shader test
From: Timothy Arceri Inputs to geometry shaders must be an array. --- .../arb_separate_shader_objects/compiler/1.50/layout-location.geom | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.50/layout-location.geom b/tests/spec/arb_separate_shader_objects/compiler/1.50/layout-location.geom index f34cf2e..339ff3d 100644 --- a/tests/spec/arb_separate_shader_objects/compiler/1.50/layout-location.geom +++ b/tests/spec/arb_separate_shader_objects/compiler/1.50/layout-location.geom @@ -9,14 +9,16 @@ layout(points) in; layout(points) out; -layout(location = 0) in vec4 in_position; +layout(location = 0) in vec4 in_position[]; layout(location = 0) out vec4 position; layout(location = 1) out vec4 color; void main() { -position = in_position; + for (int i = 0; i < gl_in.length(); i++) { +position = in_position[i]; color = vec4(0); EmitVertex(); + } } -- 2.4.3 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 2/2] arb_compute_shader: fix too many arguments in call to 'confirm_size'
Both patches Reviewed-by: Timothy Arceri ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] arb_separate_shader_objects: test mixed explicit and non-explicit locations
This tests a bug in Mesa where explicit locations are not taken into account when assigning varying locations which results in two inputs/outputs being given the same location. Test results: Nvidia GeForce 840M - NVIDIA 352.41: pass i965 - Mesa 11.1-dev: fail Cc: Ian Romanick Cc: Gregory Hainaut --- tests/all.py | 2 + .../arb_separate_shader_objects/CMakeLists.gl.txt | 1 + .../mixed_explicit_and_non_explicit_locations.c| 158 + 3 files changed, 161 insertions(+) create mode 100644 tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c diff --git a/tests/all.py b/tests/all.py index 4d6c781..376cad0 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2150,6 +2150,8 @@ with profile.group_manager( 'UseProgramStages - non-separable program') g(['arb_separate_shader_object-ProgramUniform-coverage'], 'ProgramUniform coverage') +g(['arb_separate_shader_object-mixed_explicit_and_non_explicit_locations', '-fbo'], + 'Mixed explicit and non-explicit locations', run_concurrent=False) g(['arb_separate_shader_object-rendezvous_by_location', '-fbo'], 'Rendezvous by location', run_concurrent=False) g(['arb_separate_shader_object-rendezvous_by_location-5-stages'], diff --git a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt index f1b15c0..e8311e3 100644 --- a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt +++ b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt @@ -15,6 +15,7 @@ piglit_add_executable (arb_separate_shader_object-compat-builtins compat-builtin piglit_add_executable (arb_separate_shader_object-GetProgramPipelineiv GetProgramPipelineiv.c) piglit_add_executable (arb_separate_shader_object-IsProgramPipeline IsProgramPipeline.c) piglit_add_executable (arb_separate_shader_object-ProgramUniform-coverage ProgramUniform-coverage.c) +piglit_add_executable (arb_separate_shader_object-mixed_explicit_and_non_explicit_locations mixed_explicit_and_non_explicit_locations.c) piglit_add_executable (arb_separate_shader_object-rendezvous_by_location rendezvous_by_location.c) piglit_add_executable (arb_separate_shader_object-rendezvous_by_location-3-stages rendezvous_by_location-3-stages.c) piglit_add_executable (arb_separate_shader_object-rendezvous_by_location-5-stages rendezvous_by_location-5-stages.c) diff --git a/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c b/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c new file mode 100644 index 000..d0ad73c --- /dev/null +++ b/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c @@ -0,0 +1,158 @@ +/* + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/** + * This tests a bug in Mesa where explicit locations are not taken into + * account when assigning varying locations which results in two + * inputs/outputs being given the same location. + */ +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + +PIGLIT_GL_TEST_CONFIG_END + +static GLuint pipeline; + +static const char *vs_code_template = + "#version %d\n" + "#extension GL_ARB_separate_shader_objects: require\n" + "#extension GL_ARB_explicit_attrib_location: require\n" + "\n" + "layout(location = 0) in vec4 piglit_vertex;\n" + "\n" + "layout(location = 0) out vec3 a;\n" +"out vec3 d;\n" +"out vec3 e;\n" + "layout(location = 1) out vec3 b;\n" +"out vec3 f;\n" + "layout(location = 2) out vec3 c;\n" + "\n" + "void main()\n" + "{\n" + "gl_Posi
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
On 11/17/2015 09:37 PM, Dylan Baker wrote: On Tue, Nov 17, 2015 at 04:25:53PM +0100, Samuel Pitoiset wrote: piglit_require_GLSL_version() requires an integer as parameter, not a float. This fixes an implicit conversion spotted by Clang. Signed-off-by: Samuel Pitoiset --- .../arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c index ff4b0e0..36b0a2d 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c @@ -115,7 +115,7 @@ piglit_init(int argc, char **argv) int i; /* Set up test */ - piglit_require_GLSL_version(1.50); + piglit_require_GLSL_version(150); piglit_require_transform_feedback(); piglit_require_extension("GL_ARB_gpu_shader_fp64"); -- 2.6.2 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit Reviewed-by: Dylan Baker Seems like I don't have access to push to piglit repository (but it works for mesa btw). Counting objects: 13, done. Delta compression using up to 4 threads. Compressing objects: 100% (13/13), done. Writing objects: 100% (13/13), 1.40 KiB | 0 bytes/s, done. Total 13 (delta 11), reused 0 (delta 0) error: insufficient permission for adding an object to repository database ./objects fatal: failed to write object error: unpack failed: unpack-objects abnormal exit To ssh://git.freedesktop.org/git/piglit ! [remote rejected] master -> master (n/a (unpacker error)) error: failed to push some refs to 'ssh://git.freedesktop.org/git/piglit' Can someone have a look at this, please? Thanks. ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
On 11/18/2015 12:30 AM, Samuel Pitoiset wrote: On 11/17/2015 09:37 PM, Dylan Baker wrote: On Tue, Nov 17, 2015 at 04:25:53PM +0100, Samuel Pitoiset wrote: piglit_require_GLSL_version() requires an integer as parameter, not a float. This fixes an implicit conversion spotted by Clang. Signed-off-by: Samuel Pitoiset --- .../arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c index ff4b0e0..36b0a2d 100644 --- a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c +++ b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c @@ -115,7 +115,7 @@ piglit_init(int argc, char **argv) int i; /* Set up test */ -piglit_require_GLSL_version(1.50); +piglit_require_GLSL_version(150); piglit_require_transform_feedback(); piglit_require_extension("GL_ARB_gpu_shader_fp64"); -- 2.6.2 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit Reviewed-by: Dylan Baker Seems like I don't have access to push to piglit repository (but it works for mesa btw). Counting objects: 13, done. Delta compression using up to 4 threads. Compressing objects: 100% (13/13), done. Writing objects: 100% (13/13), 1.40 KiB | 0 bytes/s, done. Total 13 (delta 11), reused 0 (delta 0) error: insufficient permission for adding an object to repository database ./objects fatal: failed to write object error: unpack failed: unpack-objects abnormal exit To ssh://git.freedesktop.org/git/piglit ! [remote rejected] master -> master (n/a (unpacker error)) error: failed to push some refs to 'ssh://git.freedesktop.org/git/piglit' Can someone have a look at this, please? Thanks. Ilia just told me that it's not the same permission for mesa and piglit. Can someone give me access to push or do I need to create a ticket on bugs.freedesktop like for mesa? ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH v2] Implement piglit tests for EXT_blend_func_extended
--- tests/all.py | 13 +++ .../api/CMakeLists.gles2.txt | 5 + .../api/CMakeLists.gles3.txt | 6 ++ .../api/bindfragdataindexed-invalid-parameters.c | 8 ++ tests/spec/arb_blend_func_extended/api/blend-api.c | 8 ++ tests/spec/arb_blend_func_extended/api/builtins.c | 111 + .../arb_blend_func_extended/api/getfragdataindex.c | 38 ++- .../arb_blend_func_extended/api/output-location.c | 29 +- .../execution/CMakeLists.gles2.txt | 4 + .../execution/CMakeLists.gles3.txt | 6 ++ .../execution/fbo-extended-blend-explicit.c| 69 +++-- .../execution/fbo-extended-blend-pattern.c | 77 +- .../execution/fbo-extended-blend.c | 69 +++-- 13 files changed, 425 insertions(+), 18 deletions(-) create mode 100644 tests/spec/arb_blend_func_extended/api/CMakeLists.gles2.txt create mode 100644 tests/spec/arb_blend_func_extended/api/CMakeLists.gles3.txt create mode 100644 tests/spec/arb_blend_func_extended/api/builtins.c create mode 100644 tests/spec/arb_blend_func_extended/execution/CMakeLists.gles2.txt create mode 100644 tests/spec/arb_blend_func_extended/execution/CMakeLists.gles3.txt diff --git a/tests/all.py b/tests/all.py index ee2b7d9..b81578d 100644 --- a/tests/all.py +++ b/tests/all.py @@ -3982,6 +3982,19 @@ with profile.group_manager( run_concurrent=False) g(['arb_blend_func_extended-fbo-extended-blend-pattern'], run_concurrent=False) +g(['arb_blend_func_extended-blend-api_gles2'], run_concurrent=False) +g(['arb_blend_func_extended-builtins_gles2'], run_concurrent=False) +g(['arb_blend_func_extended-bindfragdataindexed-invalid-parameters_gles3'], + run_concurrent=False) +g(['arb_blend_func_extended-output-location_gles3'], run_concurrent=False) +g(['arb_blend_func_extended-getfragdataindex_gles3'], run_concurrent=False) +g(['arb_blend_func_extended-fbo-extended-blend-pattern_gles2'], + run_concurrent=False) +g(['arb_blend_func_extended-fbo-extended-blend-pattern_gles3'], + run_concurrent=False) +g(['arb_blend_func_extended-fbo-extended-blend_gles3'], run_concurrent=False) +g(['arb_blend_func_extended-fbo-extended-blend-explicit_gles3'], + run_concurrent=False) with profile.group_manager( PiglitGLTest, diff --git a/tests/spec/arb_blend_func_extended/api/CMakeLists.gles2.txt b/tests/spec/arb_blend_func_extended/api/CMakeLists.gles2.txt new file mode 100644 index 000..2966073 --- /dev/null +++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gles2.txt @@ -0,0 +1,5 @@ +link_libraries(piglitutil_${piglit_target_api}) + +piglit_add_executable (arb_blend_func_extended-blend-api_${piglit_target_api} blend-api) +piglit_add_executable (arb_blend_func_extended-builtins_${piglit_target_api} builtins.c) +# vim: ft=cmake: diff --git a/tests/spec/arb_blend_func_extended/api/CMakeLists.gles3.txt b/tests/spec/arb_blend_func_extended/api/CMakeLists.gles3.txt new file mode 100644 index 000..a005fc2 --- /dev/null +++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gles3.txt @@ -0,0 +1,6 @@ +link_libraries(piglitutil_${piglit_target_api}) + +piglit_add_executable (arb_blend_func_extended-bindfragdataindexed-invalid-parameters_${piglit_target_api} bindfragdataindexed-invalid-parameters.c) +piglit_add_executable (arb_blend_func_extended-output-location_${piglit_target_api} output-location.c) +piglit_add_executable (arb_blend_func_extended-getfragdataindex_${piglit_target_api} getfragdataindex.c) +# vim: ft=cmake: diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c index 7ef6048..c4a8d53 100644 --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c @@ -31,7 +31,11 @@ PIGLIT_GL_TEST_CONFIG_BEGIN +#ifdef PIGLIT_USE_OPENGL config.supports_gl_compat_version = 10; +#else // PIGLIT_USE_OPENGLES3 + config.supports_gl_es_version = 30; +#endif config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; PIGLIT_GL_TEST_CONFIG_END @@ -47,8 +51,12 @@ void piglit_init(int argc, char **argv) GLint max_draw_buffers, max_dual_source; GLuint prog; +#ifdef PIGLIT_USE_OPENGL piglit_require_gl_version(30); piglit_require_extension("GL_ARB_blend_func_extended"); +#else // PIGLIT_USE_OPENGLES3 + piglit_require_extension("GL_EXT_blend_func_extended"); +#endif glGetIntegerv(GL_MAX_DRAW_BUFFERS, &max_draw_buffers); glGetIntegerv(GL_MAX_DUAL_SOURCE_DRAW_BUFFERS, &max_dual_source); diff --git a/tests/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
> Ilia just told me that it's not the same permission for mesa and piglit. > Can someone give me access to push or do I need to create a ticket on > bugs.freedesktop like for mesa? > Daniel Stone is the right person I think. I can push the patch in the meantime. signature.asc Description: PGP signature ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
On Tue, Nov 17, 2015 at 04:49:37PM -0800, Dylan Baker wrote: > > Ilia just told me that it's not the same permission for mesa and piglit. > > Can someone give me access to push or do I need to create a ticket on > > bugs.freedesktop like for mesa? > > > > Daniel Stone is the right person I think. I can push the patch in the > meantime. Both patches pushed. signature.asc Description: PGP signature ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/2] arb_gpu_shader_fp64: fix wrong use of GLSL version
On 11/18/2015 01:55 AM, Dylan Baker wrote: On Tue, Nov 17, 2015 at 04:49:37PM -0800, Dylan Baker wrote: Ilia just told me that it's not the same permission for mesa and piglit. Can someone give me access to push or do I need to create a ticket on bugs.freedesktop like for mesa? Daniel Stone is the right person I think. I can push the patch in the meantime. Both patches pushed. Thanks Dylan. ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit