Re: [Piglit] [PATCH] ARB_point_parameters: port glean test pointatten to piglit

2017-06-28 Thread Brian Paul 

LGTM.

Reviewed-by: Brian Paul 


On 06/28/2017 05:33 PM, Timothy Arceri wrote:

Ping. Any comments on  this?

If not I'll probably push this soon as its one of the bigger bottle
necks in my piglit runs.

On 21/06/17 10:33, Timothy Arceri wrote:

---
  tests/all.py   |   6 +-
  tests/glean/CMakeLists.gl.txt  |   1 -
  tests/glean/tpointatten.cpp| 294
-
  tests/glean/tpointatten.h  |  78 --
  tests/llvmpipe.py  |   1 -
  tests/spec/CMakeLists.txt  |   1 +
  tests/spec/arb_point_parameters/CMakeLists.gl.txt  |  13 +
  tests/spec/arb_point_parameters/CMakeLists.txt |   1 +
  .../spec/arb_point_parameters/point-attenuation.c  | 232

  9 files changed, 252 insertions(+), 375 deletions(-)
  delete mode 100644 tests/glean/tpointatten.cpp
  delete mode 100644 tests/glean/tpointatten.h
  create mode 100644 tests/spec/arb_point_parameters/CMakeLists.gl.txt
  create mode 100644 tests/spec/arb_point_parameters/CMakeLists.txt
  create mode 100644 tests/spec/arb_point_parameters/point-attenuation.c

diff --git a/tests/all.py b/tests/all.py
index f0a7c05..9e19e1f 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -293,21 +293,20 @@ MSAA_SAMPLE_COUNTS = ['2', '4', '6', '8', '16',
'32']
  with profile.test_list.group_manager(GleanTest, 'glean') as g:
  g('basic')
  g('api2')
  g('makeCurrent')
  g('bufferObject')
  g('depthStencil')
  g('fbo')
  g('getString')
  g('pixelFormats')
-g('pointAtten')
  g('pointSprite')
  # exactRGBA is not included intentionally, because it's too
strict and
  # the equivalent functionality is covered by other tests
  g('shaderAPI')
  g('texCombine')
  g('texCube')
  g('texEnv')
  g('texgen')
  g('texCombine4')
  g('texture_srgb')
@@ -2232,20 +2231,25 @@ with profile.test_list.group_manager(
  grouptools.join('spec', 'ARB_occlusion_query')) as g:
  g(['occlusion_query'])
  g(['occlusion_query_conform'])
  g(['occlusion_query_lifetime'])
  g(['occlusion_query_meta_fragments'])
  g(['occlusion_query_meta_no_fragments'])
  g(['occlusion_query_meta_save'])
  g(['occlusion_query_order'])
  g(['gen_delete_while_active'])
+with profile.test_list.group_manager(
+PiglitGLTest,
+grouptools.join('spec', 'ARB_point_parameters')) as g:
+g(['arb_point_parameters-point-attenuation'])
+
  # Group ARB_separate_shader_objects
  with profile.test_list.group_manager(
  PiglitGLTest,
  grouptools.join('spec', 'ARB_separate_shader_objects')) as g:

g(['arb_separate_shader_object-ActiveShaderProgram-invalid-program'],
'ActiveShaderProgram with invalid program')
  g(['arb_separate_shader_object-GetProgramPipelineiv'],
'GetProgramPipelineiv')
  g(['arb_separate_shader_object-dlist'], 'Display lists (Compat)')
  g(['arb_separate_shader_object-IsProgramPipeline'],
diff --git a/tests/glean/CMakeLists.gl.txt
b/tests/glean/CMakeLists.gl.txt
index 576cde1..9bbf324 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -28,21 +28,20 @@ piglit_add_executable (glean
  rc.cpp
  tapi2.cpp
  tbasic.cpp
  tbinding.cpp
  test.cpp
  tfbo.cpp
  tfragprog1.cpp
  tglsl1.cpp
  tmultitest.cpp
  tpixelformats.cpp
-tpointatten.cpp
  tpointsprite.cpp
  tshaderapi.cpp
  ttexcombine.cpp
  ttexcombine4.cpp
  ttexcube.cpp
  ttexenv.cpp
  ttexgen.cpp
  ttexture_srgb.cpp
  ttexunits.cpp
  tvertarraybgra.cpp
diff --git a/tests/glean/tpointatten.cpp b/tests/glean/tpointatten.cpp
deleted file mode 100644
index 49d9dac..000
--- a/tests/glean/tpointatten.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-// BEGIN_COPYRIGHT -*- glean -*-
-//
-// Copyright (C) 1999  Allen Akin   All Rights Reserved.
-//
-// 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 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 ALLEN AKIN BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-// AN ACTION OF CONTRACT, TORT OR OTHERWISE,

Re: [Piglit] [PATCH] ARB_point_parameters: port glean test pointatten to piglit

2017-06-28 Thread Timothy Arceri 

Ping. Any comments on  this?

If not I'll probably push this soon as its one of the bigger bottle 
necks in my piglit runs.


On 21/06/17 10:33, Timothy Arceri wrote:

---
  tests/all.py   |   6 +-
  tests/glean/CMakeLists.gl.txt  |   1 -
  tests/glean/tpointatten.cpp| 294 -
  tests/glean/tpointatten.h  |  78 --
  tests/llvmpipe.py  |   1 -
  tests/spec/CMakeLists.txt  |   1 +
  tests/spec/arb_point_parameters/CMakeLists.gl.txt  |  13 +
  tests/spec/arb_point_parameters/CMakeLists.txt |   1 +
  .../spec/arb_point_parameters/point-attenuation.c  | 232 
  9 files changed, 252 insertions(+), 375 deletions(-)
  delete mode 100644 tests/glean/tpointatten.cpp
  delete mode 100644 tests/glean/tpointatten.h
  create mode 100644 tests/spec/arb_point_parameters/CMakeLists.gl.txt
  create mode 100644 tests/spec/arb_point_parameters/CMakeLists.txt
  create mode 100644 tests/spec/arb_point_parameters/point-attenuation.c

diff --git a/tests/all.py b/tests/all.py
index f0a7c05..9e19e1f 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -293,21 +293,20 @@ MSAA_SAMPLE_COUNTS = ['2', '4', '6', '8', '16', '32']
  
  with profile.test_list.group_manager(GleanTest, 'glean') as g:

  g('basic')
  g('api2')
  g('makeCurrent')
  g('bufferObject')
  g('depthStencil')
  g('fbo')
  g('getString')
  g('pixelFormats')
-g('pointAtten')
  g('pointSprite')
  # exactRGBA is not included intentionally, because it's too strict and
  # the equivalent functionality is covered by other tests
  g('shaderAPI')
  g('texCombine')
  g('texCube')
  g('texEnv')
  g('texgen')
  g('texCombine4')
  g('texture_srgb')
@@ -2232,20 +2231,25 @@ with profile.test_list.group_manager(
  grouptools.join('spec', 'ARB_occlusion_query')) as g:
  g(['occlusion_query'])
  g(['occlusion_query_conform'])
  g(['occlusion_query_lifetime'])
  g(['occlusion_query_meta_fragments'])
  g(['occlusion_query_meta_no_fragments'])
  g(['occlusion_query_meta_save'])
  g(['occlusion_query_order'])
  g(['gen_delete_while_active'])
  
+with profile.test_list.group_manager(

+PiglitGLTest,
+grouptools.join('spec', 'ARB_point_parameters')) as g:
+g(['arb_point_parameters-point-attenuation'])
+
  # Group ARB_separate_shader_objects
  with profile.test_list.group_manager(
  PiglitGLTest,
  grouptools.join('spec', 'ARB_separate_shader_objects')) as g:
  g(['arb_separate_shader_object-ActiveShaderProgram-invalid-program'],
'ActiveShaderProgram with invalid program')
  g(['arb_separate_shader_object-GetProgramPipelineiv'],
'GetProgramPipelineiv')
  g(['arb_separate_shader_object-dlist'], 'Display lists (Compat)')
  g(['arb_separate_shader_object-IsProgramPipeline'],
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt
index 576cde1..9bbf324 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -28,21 +28,20 @@ piglit_add_executable (glean
rc.cpp
tapi2.cpp
tbasic.cpp
tbinding.cpp
test.cpp
tfbo.cpp
tfragprog1.cpp
tglsl1.cpp
tmultitest.cpp
tpixelformats.cpp
-   tpointatten.cpp
tpointsprite.cpp
tshaderapi.cpp
ttexcombine.cpp
ttexcombine4.cpp
ttexcube.cpp
ttexenv.cpp
ttexgen.cpp
ttexture_srgb.cpp
ttexunits.cpp
tvertarraybgra.cpp
diff --git a/tests/glean/tpointatten.cpp b/tests/glean/tpointatten.cpp
deleted file mode 100644
index 49d9dac..000
--- a/tests/glean/tpointatten.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-// BEGIN_COPYRIGHT -*- glean -*-
-//
-// Copyright (C) 1999  Allen Akin   All Rights Reserved.
-//
-// 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 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 ALLEN AKIN 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