On Tue, Nov 20, 2012 at 1:09 PM, Matt Turner <matts...@gmail.com> wrote:
> The function was named badly and wasn't in the dispatch table,
> making it hard to find.
>
> Fixes transform_feedback2_states and gets a few other transform
> feedback tests closer to working in es3conform.
> ---
> src/mapi/glapi/gen/GL3x.xml | 2 +-
> src/mesa/main/get.c | 4 ++--
> src/mesa/main/get.h | 2 +-
> src/mesa/main/tests/dispatch_sanity.cpp | 3 +--
> 4 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
> index 1b7addd..c17a644 100644
> --- a/src/mapi/glapi/gen/GL3x.xml
> +++ b/src/mapi/glapi/gen/GL3x.xml
> @@ -595,7 +595,7 @@
> <enum name="MAX_FRAGMENT_INPUT_COMPONENTS" value="0x9125"/>
> <enum name="CONTEXT_PROFILE_MASK" value="0x9126"/>
>
> - <function name="GetInteger64i_v" offset="assign" es2="3.0" exec="skip">
> + <function name="GetInteger64i_v" offset="assign" es2="3.0">
> <param name="cap" type="GLenum"/>
> <param name="index" type="GLuint"/>
> <param name="data" type="GLint64 *"/>
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 077cf2d..76c3651 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -1742,11 +1742,11 @@ _mesa_GetIntegeri_v( GLenum pname, GLuint index,
> GLint *params )
> }
>
> void GLAPIENTRY
> -_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
> +_mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params )
> {
> union value v;
> enum value_type type =
> - find_value_indexed("glGetIntegerIndexedv", pname, index, &v);
> + find_value_indexed("glGetInteger64i_v", pname, index, &v);
>
> switch (type) {
> case TYPE_INT:
> diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h
> index 4daa1ae..6b0158f 100644
> --- a/src/mesa/main/get.h
> +++ b/src/mesa/main/get.h
> @@ -60,7 +60,7 @@ extern void GLAPIENTRY
> _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params );
>
> extern void GLAPIENTRY
> -_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params );
> +_mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params );
>
> extern void GLAPIENTRY
> _mesa_GetPointerv( GLenum pname, GLvoid **params );
> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
> b/src/mesa/main/tests/dispatch_sanity.cpp
> index a285559..3450b86 100644
> --- a/src/mesa/main/tests/dispatch_sanity.cpp
> +++ b/src/mesa/main/tests/dispatch_sanity.cpp
> @@ -1310,8 +1310,7 @@ const struct function gles3_functions_possible[] = {
> // We check for the aliased -OES version in GLES 2
> // { "glGetBufferPointerv", 30, -1 },
> { "glGetFragDataLocation", 30, -1 },
> - /// XXX: Missing implementation of glGetInteger64i_v
> - // { "glGetInteger64i_v", 30, -1 },
> + { "glGetInteger64i_v", 30, -1 },
> { "glGetInteger64v", 30, -1 },
> { "glGetIntegeri_v", 30, -1 },
> // XXX: Missing implementation of ARB_internalformat_query
> --
> 1.7.8.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Both patches are Reviewed-by Anuj Phogat <anuj.pho...@gmail.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
