On Mon, Feb 8, 2010 at 5:45 PM, Brian Paul <brian.e.p...@gmail.com> wrote:
> On Sun, Feb 7, 2010 at 3:16 PM, Pauli Nieminen <suok...@gmail.com> wrote:
>> Queried variables GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS and
>> GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS are not part ARB_vertex_program.
>> Mesa only returns them if driver implements ARB_vertex_shader
>> which is correct according to extension specifications.
>>
>> Signed-off-by: Pauli Nieminen <suok...@gmail.com>
>> ---
>> tests/shaders/vp-combined-image-units.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/tests/shaders/vp-combined-image-units.c
>> b/tests/shaders/vp-combined-image-units.c
>> index 743fc3d..0dc4a42 100644
>> --- a/tests/shaders/vp-combined-image-units.c
>> +++ b/tests/shaders/vp-combined-image-units.c
>> @@ -74,5 +74,6 @@ piglit_display(void)
>> void
>> piglit_init(int argc, char **argv)
>> {
>> - piglit_require_extension("GL_ARB_vertex_program");
>> + piglit_require_extension("GL_ARB_vertex_shader");
>> }
>> +
>> --
>
> There's also a comment near the top of the file which should be
> updated. Thanks.
>
Cleaned a a bit more the code and attached the patch. Here is change set also:
diff --git a/tests/shaders/vp-combined-image-units.c
b/tests/shaders/vp-combined-image-units.c
index 743fc3d..324e0df 100644
--- a/tests/shaders/vp-combined-image-units.c
+++ b/tests/shaders/vp-combined-image-units.c
@@ -27,7 +27,7 @@
/** @file vp-combined-image-units.c
*
- * Tests that ARB_vertex_program returns a not-impossible result for
+ * Tests that ARB_shader_program returns a not-impossible result for
* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS. Catches a regression in wine caused
* by bug #25518.
*/
@@ -53,15 +53,13 @@ piglit_display(void)
pass = GL_FALSE;
}
- if (GLEW_ARB_fragment_program) {
- glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &fragment);
- if (combined < fragment) {
- fprintf(stderr,
- "Max fragment units (%d) > "
- "combined units (%d)\n",
- fragment, combined);
- pass = GL_FALSE;
- }
+ glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &fragment);
+ if (combined < fragment) {
+ fprintf(stderr,
+ "Max fragment units (%d) > "
+ "combined units (%d)\n",
+ fragment, combined);
+ pass = GL_FALSE;
}
pass = pass && glGetError() == 0;
@@ -74,5 +72,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_extension("GL_ARB_vertex_program");
+ piglit_require_extension("GL_ARB_vertex_shader");
}
> Can you commit to piglit?
>
No.
> -Brian
>
From 5e08bd4e3eb931b108cfee2be0c17c8ee99df71a Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <suok...@gmail.com>
Date: Sun, 7 Feb 2010 05:57:11 +0200
Subject: [PATCH] piglit: Pump requirements for vp-combined-image-units to vertex shader.
Queried variables GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS and
GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS are not part ARB_vertex_program.
Mesa only returns them if driver implements ARB_vertex_shader
which is correct according to extension specifications.
v2: Fix the test description. Also remove the test for gl extension
from test code.
---
tests/shaders/vp-combined-image-units.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/tests/shaders/vp-combined-image-units.c b/tests/shaders/vp-combined-image-units.c
index 743fc3d..324e0df 100644
--- a/tests/shaders/vp-combined-image-units.c
+++ b/tests/shaders/vp-combined-image-units.c
@@ -27,7 +27,7 @@
/** @file vp-combined-image-units.c
*
- * Tests that ARB_vertex_program returns a not-impossible result for
+ * Tests that ARB_shader_program returns a not-impossible result for
* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS. Catches a regression in wine caused
* by bug #25518.
*/
@@ -53,15 +53,13 @@ piglit_display(void)
pass = GL_FALSE;
}
- if (GLEW_ARB_fragment_program) {
- glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &fragment);
- if (combined < fragment) {
- fprintf(stderr,
- "Max fragment units (%d) > "
- "combined units (%d)\n",
- fragment, combined);
- pass = GL_FALSE;
- }
+ glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &fragment);
+ if (combined < fragment) {
+ fprintf(stderr,
+ "Max fragment units (%d) > "
+ "combined units (%d)\n",
+ fragment, combined);
+ pass = GL_FALSE;
}
pass = pass && glGetError() == 0;
@@ -74,5 +72,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_extension("GL_ARB_vertex_program");
+ piglit_require_extension("GL_ARB_vertex_shader");
}
+
--
1.6.3.3
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
