Re: [Piglit] [PATCH 0/2] shader_runner: fix gles3 glMapBuffer workaround

[Tapani Pälli]

Verified access bitfield values from spec, series:

Reviewed-by: Tapani Pälli 

On 4/11/19 12:14 PM, Alejandro Piñeiro wrote:

Alejandro Piñeiro (2):
   shader_runner: fix error checking on MapBuffer gles workaround
   shader_runner: get proper access bitfield when calling MapBufferRange

  .../shaders/shader_runner_gles_workarounds.h  | 21 ---
  1 file changed, 18 insertions(+), 3 deletions(-)


___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH 1/2] shader_runner: fix error checking on MapBuffer gles workaround

[Eric Engestrom]

On Thursday, 2019-04-11 11:14:41 +0200, Alejandro Piñeiro wrote:
> ---
>  tests/shaders/shader_runner_gles_workarounds.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/shaders/shader_runner_gles_workarounds.h 
> b/tests/shaders/shader_runner_gles_workarounds.h
> index d3ab77506..77956f6b9 100644
> --- a/tests/shaders/shader_runner_gles_workarounds.h
> +++ b/tests/shaders/shader_runner_gles_workarounds.h
> @@ -79,7 +79,7 @@ glMapBuffer(GLenum target, GLbitfield access)
>   GLsizeiptr length = 0;
>  
>   glGetBufferParameteri64v(target, GL_BUFFER_SIZE, (GLint64*) );
> - if (piglit_check_gl_error(GL_NO_ERROR))
> + if (!piglit_check_gl_error(GL_NO_ERROR))

This patch is:
Reviewed-by: Eric Engestrom 

>   piglit_report_result(PIGLIT_FAIL);
>  
>   return glMapBufferRange(target, 0, length, access);
> -- 
> 2.19.1
> 
> ___
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 2/2] shader_runner: get proper access bitfield when calling MapBufferRange

[Alejandro Piñeiro]

Current workaround assumes that glMapBuffer and glMapBufferRange
'access' bitfield uses the same values, when it is not.
---
 .../shaders/shader_runner_gles_workarounds.h  | 19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/shaders/shader_runner_gles_workarounds.h 
b/tests/shaders/shader_runner_gles_workarounds.h
index 77956f6b9..bbcdc9b4a 100644
--- a/tests/shaders/shader_runner_gles_workarounds.h
+++ b/tests/shaders/shader_runner_gles_workarounds.h
@@ -72,17 +72,32 @@ unsupported_function(const char *name, ...)
 #undef glMapBuffer
 
 static GLvoid*
-glMapBuffer(GLenum target, GLbitfield access)
+glMapBuffer(GLenum target, GLbitfield map_buffer_access)
 {
/* Emulate with glMapBufferRange. */
 
GLsizeiptr length = 0;
+   GLbitfield map_buffer_range_access;
 
glGetBufferParameteri64v(target, GL_BUFFER_SIZE, (GLint64*) );
if (!piglit_check_gl_error(GL_NO_ERROR))
piglit_report_result(PIGLIT_FAIL);
 
-   return glMapBufferRange(target, 0, length, access);
+   switch (map_buffer_access) {
+   case GL_READ_ONLY:
+   map_buffer_range_access = GL_MAP_READ_BIT;
+   break;
+   case GL_WRITE_ONLY:
+   map_buffer_range_access = GL_MAP_WRITE_BIT;
+   break;
+   case GL_READ_WRITE:
+   map_buffer_range_access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+   break;
+   default:
+   map_buffer_range_access = 0;
+   break;
+   }
+   return glMapBufferRange(target, 0, length, map_buffer_range_access);
 }
 #endif /* PIGLIT_USE_OPENGL_ES3 */
 
-- 
2.19.1

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 0/2] shader_runner: fix gles3 glMapBuffer workaround

[Alejandro Piñeiro]

Alejandro Piñeiro (2):
  shader_runner: fix error checking on MapBuffer gles workaround
  shader_runner: get proper access bitfield when calling MapBufferRange

 .../shaders/shader_runner_gles_workarounds.h  | 21 ---
 1 file changed, 18 insertions(+), 3 deletions(-)

-- 
2.19.1

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 1/2] shader_runner: fix error checking on MapBuffer gles workaround

[Alejandro Piñeiro]

---
 tests/shaders/shader_runner_gles_workarounds.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/shaders/shader_runner_gles_workarounds.h 
b/tests/shaders/shader_runner_gles_workarounds.h
index d3ab77506..77956f6b9 100644
--- a/tests/shaders/shader_runner_gles_workarounds.h
+++ b/tests/shaders/shader_runner_gles_workarounds.h
@@ -79,7 +79,7 @@ glMapBuffer(GLenum target, GLbitfield access)
GLsizeiptr length = 0;
 
glGetBufferParameteri64v(target, GL_BUFFER_SIZE, (GLint64*) );
-   if (piglit_check_gl_error(GL_NO_ERROR))
+   if (!piglit_check_gl_error(GL_NO_ERROR))
piglit_report_result(PIGLIT_FAIL);
 
return glMapBufferRange(target, 0, length, access);
-- 
2.19.1

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit