[Mesa-dev] [PATCH 11/17] mesa: Get GL_MAX_VARYING_FLOATS_ARB from VertexProgram.MaxOutputComponents

[Paul Berry]

On 10 September 2013 12:10, Ian Romanick <idr at freedesktop.org> wrote:

> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/mesa/main/get.c              | 4 ----
>  src/mesa/main/get_hash_params.py | 2 +-
>  2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 34eb6be..ae45bf8 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -718,10 +718,6 @@ find_custom_value(struct gl_context *ctx, const
> struct value_desc *d, union valu
>        ASSERT(v->value_int_n.n <= ARRAY_SIZE(v->value_int_n.ints));
>        break;
>
> -   case GL_MAX_VARYING_FLOATS_ARB:
> -      v->value_int = ctx->Const.MaxVarying * 4;
> -      break;
> -
>     /* Various object names */
>
>     case GL_TEXTURE_BINDING_1D:
> diff --git a/src/mesa/main/get_hash_params.py
> b/src/mesa/main/get_hash_params.py
> index c0dbf45..3d47443 100644
> --- a/src/mesa/main/get_hash_params.py
> +++ b/src/mesa/main/get_hash_params.py
> @@ -365,7 +365,7 @@ descriptor=[
>
>  # GL_ARB_vertex_shader
>    [ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB",
> "CONTEXT_INT(Const.VertexProgram.MaxUniformComponents),
> extra_ARB_vertex_shader" ],
> -  [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0,
> extra_ARB_vertex_shader" ],
> +  [ "MAX_VARYING_FLOATS_ARB",
> "CONTEXT_INT(Const.VertexProgram.MaxOutputComponents),
> extra_ARB_vertex_shader" ],
>
>  # GL_EXT_framebuffer_blit
>  # NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT
> --
> 1.8.1.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>


Doesn't MAX_VARYING_FLOATS need to be MIN2(MAX_VERTEX_OUTPUT_COMPONENTS,
MAX_FRAGMENT_INPUT_COMPONENTS)?  I can imagine an implementation where
MAX_FRAGMENT_INPUT_COMPONENTS is the smaller constraint (in fact, ES3's
minimum maximums constitute just such a case).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130911/80f51d6b/attachment.html>