Kenneth,
I have implemented R500 support in master and it works very well with
this series. There are also some new piglit tests. There was a typo in
the ARB_shader_texture_lod.frag file in src/glsl, which is fixed by
the attached patch. Other than that:
Tested-by: Marek Olšák <mar...@gmail.com>
I am little concerned that there will be no app using this line:
#extension GL_ARB_shader_texture_lod : require
The VDrift game is an example of that.
Marek
On Fri, Apr 22, 2011 at 9:02 PM, Kenneth Graunke <kenn...@whitecape.org> wrote:
> Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
> ---
> src/mesa/main/extensions.c | 2 +-
> src/mesa/main/mtypes.h | 1 +
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
> index 8a0ab96..fc55184 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -111,6 +111,7 @@ static const struct extension extension_table[] = {
> { "GL_ARB_seamless_cube_map", o(ARB_seamless_cube_map),
> GL, 2009 },
> { "GL_ARB_shader_objects", o(ARB_shader_objects),
> GL, 2002 },
> { "GL_ARB_shader_stencil_export",
> o(ARB_shader_stencil_export), GL, 2009 },
> + { "GL_ARB_shader_texture_lod",
> o(ARB_shader_texture_lod), GL, 2009 },
> { "GL_ARB_shading_language_100",
> o(ARB_shading_language_100), GL, 2003 },
> { "GL_ARB_shadow_ambient", o(ARB_shadow_ambient),
> GL, 2001 },
> { "GL_ARB_shadow", o(ARB_shadow),
> GL, 2001 },
> @@ -142,7 +143,6 @@ static const struct extension extension_table[] = {
> { "GL_ARB_vertex_shader", o(ARB_vertex_shader),
> GL, 2002 },
> { "GL_ARB_vertex_type_2_10_10_10_rev",
> o(ARB_vertex_type_2_10_10_10_rev), GL, 2009 },
> { "GL_ARB_window_pos", o(ARB_window_pos),
> GL, 2001 },
> -
> /* EXT extensions */
> { "GL_EXT_abgr", o(EXT_abgr),
> GL, 1995 },
> { "GL_EXT_bgra", o(EXT_bgra),
> GL, 1995 },
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 160ae9d..6e4c4f1 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -2781,6 +2781,7 @@ struct gl_extensions
> GLboolean ARB_seamless_cube_map;
> GLboolean ARB_shader_objects;
> GLboolean ARB_shader_stencil_export;
> + GLboolean ARB_shader_texture_lod;
> GLboolean ARB_shading_language_100;
> GLboolean ARB_shadow;
> GLboolean ARB_shadow_ambient;
> --
> 1.7.4.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
From 362818914574d5e6943eb7b8357cac3da41f2655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <mar...@gmail.com>
Date: Sat, 7 May 2011 02:46:58 +0200
Subject: [PATCH 1/2] glsl: fix typo in textureCubeLod declaration
---
.../builtins/profiles/ARB_shader_texture_lod.frag | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glsl/builtins/profiles/ARB_shader_texture_lod.frag b/src/glsl/builtins/profiles/ARB_shader_texture_lod.frag
index fefd707..c15e2a1 100644
--- a/src/glsl/builtins/profiles/ARB_shader_texture_lod.frag
+++ b/src/glsl/builtins/profiles/ARB_shader_texture_lod.frag
@@ -10,7 +10,7 @@ vec4 texture2DProjLod(sampler2D sampler, vec3 coord, float lod);
vec4 texture2DProjLod(sampler2D sampler, vec4 coord, float lod);
vec4 texture3DLod (sampler3D sampler, vec3 coord, float lod);
vec4 texture3DProjLod(sampler3D sampler, vec4 coord, float lod);
-vec4 textureCubeLod (sampler3D sampler, vec3 coord, float lod);
+vec4 textureCubeLod (samplerCube sampler, vec3 coord, float lod);
vec4 shadow1DLod (sampler1DShadow sampler, vec3 coord, float lod);
vec4 shadow2DLod (sampler2DShadow sampler, vec3 coord, float lod);
vec4 shadow1DProjLod(sampler1DShadow sampler, vec4 coord, float lod);
--
1.7.4.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
