Module: Mesa Branch: asm-shader-rework-3 Commit: bc68464b9cfe586401d2a22b7158e7d3b9d9bc56 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc68464b9cfe586401d2a22b7158e7d3b9d9bc56
Author: Ian Romanick <[email protected]> Date: Fri Oct 2 22:29:31 2009 -0700 ARB prog: Copy non-native program limits to native limits for sw drivers --- src/mesa/drivers/dri/swrast/swrast.c | 34 ++++++++++++++++++++++++++++++++++ src/mesa/drivers/x11/xm_api.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index 2299409..cd9d234 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -652,6 +652,40 @@ driCreateNewContext(__DRIscreen *screen, const __DRIconfig *config, _mesa_enable_2_0_extensions(mesaCtx); _mesa_enable_2_1_extensions(mesaCtx); + mesaCtx->Const.VertexProgram.MaxNativeInstructions = + mesaCtx->Const.VertexProgram.MaxInstructions; + mesaCtx->Const.VertexProgram.MaxNativeAluInstructions = + mesaCtx->Const.VertexProgram.MaxAluInstructions; + mesaCtx->Const.VertexProgram.MaxNativeTexInstructions = + mesaCtx->Const.VertexProgram.MaxTexInstructions; + mesaCtx->Const.VertexProgram.MaxNativeTexIndirections = + mesaCtx->Const.VertexProgram.MaxTexIndirections; + mesaCtx->Const.VertexProgram.MaxNativeAttribs = + mesaCtx->Const.VertexProgram.MaxAttribs; + mesaCtx->Const.VertexProgram.MaxNativeTemps = + mesaCtx->Const.VertexProgram.MaxTemps; + mesaCtx->Const.VertexProgram.MaxNativeAddressRegs = + mesaCtx->Const.VertexProgram.MaxAddressRegs; + mesaCtx->Const.VertexProgram.MaxNativeParameters = + mesaCtx->Const.VertexProgram.MaxParameters; + + mesaCtx->Const.FragmentProgram.MaxNativeInstructions = + mesaCtx->Const.FragmentProgram.MaxInstructions; + mesaCtx->Const.FragmentProgram.MaxNativeAluInstructions = + mesaCtx->Const.FragmentProgram.MaxAluInstructions; + mesaCtx->Const.FragmentProgram.MaxNativeTexInstructions = + mesaCtx->Const.FragmentProgram.MaxTexInstructions; + mesaCtx->Const.FragmentProgram.MaxNativeTexIndirections = + mesaCtx->Const.FragmentProgram.MaxTexIndirections; + mesaCtx->Const.FragmentProgram.MaxNativeAttribs = + mesaCtx->Const.FragmentProgram.MaxAttribs; + mesaCtx->Const.FragmentProgram.MaxNativeTemps = + mesaCtx->Const.FragmentProgram.MaxTemps; + mesaCtx->Const.FragmentProgram.MaxNativeAddressRegs = + mesaCtx->Const.FragmentProgram.MaxAddressRegs; + mesaCtx->Const.FragmentProgram.MaxNativeParameters = + mesaCtx->Const.FragmentProgram.MaxParameters; + _mesa_meta_init(mesaCtx); return ctx; diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index c6352c0..a5b0d62 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -1649,6 +1649,40 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) xmesa_register_swrast_functions( mesaCtx ); _swsetup_Wakeup(mesaCtx); + mesaCtx->Const.VertexProgram.MaxNativeInstructions = + mesaCtx->Const.VertexProgram.MaxInstructions; + mesaCtx->Const.VertexProgram.MaxNativeAluInstructions = + mesaCtx->Const.VertexProgram.MaxAluInstructions; + mesaCtx->Const.VertexProgram.MaxNativeTexInstructions = + mesaCtx->Const.VertexProgram.MaxTexInstructions; + mesaCtx->Const.VertexProgram.MaxNativeTexIndirections = + mesaCtx->Const.VertexProgram.MaxTexIndirections; + mesaCtx->Const.VertexProgram.MaxNativeAttribs = + mesaCtx->Const.VertexProgram.MaxAttribs; + mesaCtx->Const.VertexProgram.MaxNativeTemps = + mesaCtx->Const.VertexProgram.MaxTemps; + mesaCtx->Const.VertexProgram.MaxNativeAddressRegs = + mesaCtx->Const.VertexProgram.MaxAddressRegs; + mesaCtx->Const.VertexProgram.MaxNativeParameters = + mesaCtx->Const.VertexProgram.MaxParameters; + + mesaCtx->Const.FragmentProgram.MaxNativeInstructions = + mesaCtx->Const.FragmentProgram.MaxInstructions; + mesaCtx->Const.FragmentProgram.MaxNativeAluInstructions = + mesaCtx->Const.FragmentProgram.MaxAluInstructions; + mesaCtx->Const.FragmentProgram.MaxNativeTexInstructions = + mesaCtx->Const.FragmentProgram.MaxTexInstructions; + mesaCtx->Const.FragmentProgram.MaxNativeTexIndirections = + mesaCtx->Const.FragmentProgram.MaxTexIndirections; + mesaCtx->Const.FragmentProgram.MaxNativeAttribs = + mesaCtx->Const.FragmentProgram.MaxAttribs; + mesaCtx->Const.FragmentProgram.MaxNativeTemps = + mesaCtx->Const.FragmentProgram.MaxTemps; + mesaCtx->Const.FragmentProgram.MaxNativeAddressRegs = + mesaCtx->Const.FragmentProgram.MaxAddressRegs; + mesaCtx->Const.FragmentProgram.MaxNativeParameters = + mesaCtx->Const.FragmentProgram.MaxParameters; + _mesa_meta_init(mesaCtx); return c; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
