[Mesa-dev] [PATCH 1/3] mesa: fix GL error checking in TransformFeedbackVaryings

2011-10-26 Thread Marek Olšák
--- src/mesa/main/transformfeedback.c |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index 47efad1..86fff88 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@

[Mesa-dev] [PATCH 2/3] mesa: improve EXT_transform_feedback display list support

2011-10-26 Thread Marek Olšák
--- src/mesa/main/dlist.c | 19 +-- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index d901bdd..52548fd 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -69,6 +69,9 @@ #if

[Mesa-dev] [PATCH 3/3] mesa: initialize ARB_transform_feedback2 dispatch

2011-10-26 Thread Marek Olšák
--- src/mesa/main/api_exec.c |1 + src/mesa/main/transformfeedback.c | 10 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 93214dd..1bc39db 100644 --- a/src/mesa/main/api_exec.c +++

[Mesa-dev] [PATCH] glsl: translate transform feedback varyings into low-level representation

2011-10-26 Thread Marek Olšák
+++ b/src/glsl/ir_set_transform_feedback_outs.cpp @@ -0,0 +1,299 @@ +/* + * Copyright © 2010 Intel Corporation + * Copyright © 2011 Marek Olšák mar...@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files

Re: [Mesa-dev] [PATCH 1/5] u_format: Fix bit definition of UF10_MANTISSA_BITS.

2011-10-26 Thread Marek Olšák
This series is: Reviewed-by: Marek Olšák mar...@gmail.com Thanks. Marek On Thu, Oct 27, 2011 at 1:46 AM, Eric Anholt e...@anholt.net wrote: This is only used in the code for packing to INF, and resulted in an extra bit set that was set anyway, so it was harmless except for the confusion

Re: [Mesa-dev] Implement NV_fog_distance for Gallium hardware

2011-10-27 Thread Marek Olšák
If there are no other concerns, I'll push this on Saturday, including the nv20 fix from Francisco Jerez. http://cgit.freedesktop.org/~mareko/mesa/log/?h=nv-fog-distance Marek On Tue, Sep 20, 2011 at 7:50 AM, Nicholas Miell nmi...@gmail.com wrote: On 09/19/2011 10:23 AM, Ian Romanick wrote: I

Re: [Mesa-dev] Implement NV_fog_distance for Gallium hardware

2011-10-27 Thread Marek Olšák
From what I can see, the fog distance is computed per-vertex and stored in the FogCoord vertex shader output. There is no fragment shader change required. The fixed-function vertex program hasn't been converted to the GLSL IR yet, only the fragment program, which is irrelevant here. Gallium only

Re: [Mesa-dev] [PATCH] r600g: Replace needless flush in texture upload.

2011-10-27 Thread Marek Olšák
Looks good to me. Ideally even texture_barrier should not be needed. set_framebuffer_state() and flush() should flush caches automatically. If they don't, there is a bug. Marek 2011/10/27 Mathias Fröhlich mathias.froehl...@gmx.net: Hi, On Saturday, October 22, 2011 13:36:37 Mathias Fröhlich

[Mesa-dev] [PATCH] r600g: remove one pointless flush

2011-10-28 Thread Marek Olšák
I've got no idea what the flush was good for, but it's useless from the looks of it. The rest of the patch is just a cleanup resulting from some of the variables being no longer used for anything useful. There are no piglit regressions. --- src/gallium/drivers/r600/r600.h|6

Re: [Mesa-dev] [PATCH] r600g: remove one pointless flush

2011-10-28 Thread Marek Olšák
On Fri, Oct 28, 2011 at 10:52 PM, Vadim Girlin vadimgir...@gmail.com wrote: On Fri, 2011-10-28 at 19:47 +0200, Marek Olšák wrote: I've got no idea what the flush was good for, but it's useless from the looks of it. The rest of the patch is just a cleanup resulting from some of the variables

Re: [Mesa-dev] [PATCH] r600g: remove one pointless flush

2011-10-28 Thread Marek Olšák
On Sat, Oct 29, 2011 at 12:58 AM, Vadim Girlin vadimgir...@gmail.com wrote: On Sat, 2011-10-29 at 01:29 +0400, Vadim Girlin wrote: On Fri, 2011-10-28 at 23:16 +0200, Marek Olšák wrote: On Fri, Oct 28, 2011 at 10:52 PM, Vadim Girlin vadimgir...@gmail.com wrote: On Fri, 2011-10-28 at 19:47

[Mesa-dev] [PATCH 0/3] GLSL linker for transform feedback

2011-11-01 Thread Marek Olšák
Hi everyone, Here's what I think is complete GLSL linker code for EXT_transform_feedback. What's missing in core Mesa is the implementation of glGetTransformFeedbackVaryingEXT, but other than that I think we're all set. The first patch is the Dan McCabe's patch with one bug fix. The second

[Mesa-dev] [PATCH 1/3] glsl: Assign transform feedback varying slots in linker.

2011-11-01 Thread Marek Olšák
are already assigned slots. A new function max_varying() is introduced to examine a previously processed shader to find the largest varying already assigned a slot. All new varyings will be assigned slots after this one. If varyings are found, -1 is returned. [ Marek Olšák: fix segfault

[Mesa-dev] [PATCH 2/3] glsl: translate transform feedback varyings into low-level representation

2011-11-01 Thread Marek Olšák
/glsl/ir_set_transform_feedback_outs.cpp @@ -0,0 +1,268 @@ +/* + * Copyright © 2010 Intel Corporation + * Copyright © 2011 Marek Olšák mar...@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files

[Mesa-dev] [PATCH 3/3] glsl: finish up the linker for transform feedback

2011-11-01 Thread Marek Olšák
--- src/glsl/linker.cpp | 192 ++- 1 files changed, 174 insertions(+), 18 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index e6012bf..d5d50b5 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1615,49 +1615,170

[Mesa-dev] [PATCH 1/2] st/mesa: set geometry shader to NULL when doing internal drawing

2011-11-04 Thread Marek Olšák
The code expects the geometry shader to be NULL. We don't have geometry shaders now, but it's good to be prepared. --- src/gallium/auxiliary/util/u_blit.c | 25 + src/gallium/auxiliary/util/u_gen_mipmap.c | 16

[Mesa-dev] [PATCH 2/2] gallium/cso_cache: remove one call to pipe_sampler_view_reference

2011-11-04 Thread Marek Olšák
--- src/gallium/auxiliary/cso_cache/cso_context.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index fdd40fc..b91fe1a 100644 ---

[Mesa-dev] [PATCH 1/2] st/mesa: set geometry shader to NULL when doing internal drawing

2011-11-04 Thread Marek Olšák
The code expects the geometry shader to be NULL. We don't have geometry shaders now, but it's good to be prepared. v2: check for support in the cso context --- src/gallium/auxiliary/cso_cache/cso_context.c | 17 - src/gallium/auxiliary/util/u_blit.c |6 ++

Re: [Mesa-dev] [PATCH 1/2] r600g: precalculate semantic indices for SPI setup

2011-11-04 Thread Marek Olšák
FYI, this commit completely breaks RV670. glxgears is completely black, other apps are either black or rendered incorrectly (mostly one-colored, the clear color I guess). Marek On Fri, Nov 4, 2011 at 6:24 PM, Vadim Girlin vadimgir...@gmail.com wrote: There is no need to duplicate semantic

Re: [Mesa-dev] [PATCH 2/3] glsl: translate transform feedback varyings into low-level representation

2011-11-04 Thread Marek Olšák
Hi Paul, I won't comment on the patch 1, because I didn't write it, I was just preserving history. On Fri, Nov 4, 2011 at 10:00 PM, Paul Berry stereotype...@gmail.com wrote: [snip] +bool parse_tfeedback_decl(const void *mem_ctx, const char *input, +                          struct

[Mesa-dev] [PATCH 2/2] mesa: implement DrawTransformFeedback from ARB_transform_feedback2

2011-11-04 Thread Marek Olšák
It's like DrawArrays, but the count is taken from a transform feedback object. This removes DrawTransformFeedback from dd_function_table and adds the same function to GLvertexformat (with the function parameters matching GL). The vbo_draw_func callback has a new parameter struct

[Mesa-dev] [PATCH 1/2] mesa: add missing checks to compute_version

2011-11-04 Thread Marek Olšák
--- src/mesa/main/version.c |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 17c0600..49cdc30 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -124,9 +124,11 @@ compute_version(struct

Re: [Mesa-dev] Mesa (master): u_blitter: add a copy_texture function which uses views and not resources

2011-11-06 Thread Marek Olšák
idea? Stéphane On Sun, Oct 23, 2011 at 11:33, Marek Olšák mar...@kemper.freedesktop.org wrote: Module: Mesa Branch: master Commit: 37b62cc35435a704d33c1814fbdbd0e807699e21 URL:     http://cgit.freedesktop.org/mesa/mesa/commit/?id=37b62cc35435a704d33c1814fbdbd0e807699e21 Author: Marek Olšák

Re: [Mesa-dev] [PATCH] glsl: Assign transform feedback varying slots in linker.

2011-11-07 Thread Marek Olšák
On Tue, Nov 8, 2011 at 1:13 AM, Paul Berry stereotype...@gmail.com wrote: +/** + * Update gl_transform_feedback_info to reflect this tfeedback_decl. + * + * If an error occurs, the error is reported through linker_error() and false + * is returned. + */ +bool +tfeedback_decl::store(struct

Re: [Mesa-dev] [PATCH] glsl: Assign transform feedback varying slots in linker.

2011-11-07 Thread Marek Olšák
On Tue, Nov 8, 2011 at 1:13 AM, Paul Berry stereotype...@gmail.com wrote: @@ -1806,16 +2187,50 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)         break;    } +   /* From GL_EXT_transform_feedback: +    *   A program will fail to link if: +    * +    *   * the

Re: [Mesa-dev] [PATCH v2] glsl: Assign transform feedback varying slots in linker.

2011-11-08 Thread Marek Olšák
, this patch is: Reviewed-by: Marek Olšák mar...@gmail.com Tested-by: Marek Olšák mar...@gmail.com Marek +      } +   } +   return true; +} + + +/** + * Assign a location for a variable that is produced in one pipeline stage + * (the producer) and consumed in the next stage (the consumer

Re: [Mesa-dev] [PATCH 01/13] mesa : move bindbuffer{base, range} from transformfeedback.c BindBuffer* functions are part of tfb extension. They are however used by others extensions such as uniform bu

2011-11-12 Thread Marek Olšák
Hi vlj, just one remark unrelated to the patch. The commit messages should start with a 76-characters-long summary, followed by an empty line, and then followed by a more thorough explanation if needed. Marek On Sat, Nov 12, 2011 at 10:11 PM, vlj v...@ovi.com wrote: ---  

Re: [Mesa-dev] TGSI declarations missing type info

2011-11-13 Thread Marek Olšák
I am guessing there is no type info because TGSI shaders are allowed to use uint, sint, and float instructions on the same register without type conversions (it would be possible to generate such usage with GL_ARB_shader_bit_enconding, also GL_NV_gpu_program4 has typeless registers too). I think

Re: [Mesa-dev] [PATCH 1/3] gallium: add PIPE_CAP_SHADER_OUTPUT_READ

2011-11-14 Thread Marek Olšák
Hi Vadim, Shouldn't this be in the pipe_shader_cap enum instead? Marek On Mon, Nov 14, 2011 at 1:57 PM, Vadim Girlin vadimgir...@gmail.com wrote: It's intended to indicate whether the driver/hardware supports reading of the values written into shader outputs. Also remove assert to allow

Re: [Mesa-dev] Allowing the reading of outputs for some drivers

2011-11-14 Thread Marek Olšák
On Mon, Nov 14, 2011 at 2:49 PM, Vadim Girlin vadimgir...@gmail.com wrote: On Mon, 2011-11-14 at 05:22 -0800, Jose Fonseca wrote: - Original Message - Hi, I found some problem with glsl_to_tgsi: remove_output_reads function. It's replacing outputs with temps, producing incorrect

Re: [Mesa-dev] Allowing the reading of outputs for some drivers

2011-11-15 Thread Marek Olšák
On Tue, Nov 15, 2011 at 9:27 AM, Ian Romanick i...@freedesktop.org wrote: I guess I don't follow.  Different hardware can do different things, and the code for that hardware will look different.  What's the problem? Well, I guess you're right. We already make the GLSL compiler do different

[Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Marek Olšák
--- src/glsl/ast_to_hir.cpp |7 +-- src/glsl/glsl_lexer.ll |1 + src/glsl/glsl_parser.yy |9 - src/glsl/ir_clone.cpp |1 + 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index ac090c3..51fec19 100644

[Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Marek Olšák
--- src/glsl/linker.cpp| 45 src/mesa/main/mtypes.h |3 ++ src/mesa/program/ir_to_mesa.cpp| 29 -- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 23 -- 4 files changed, 54

[Mesa-dev] [PATCH 3/6] gallium: implement ARB_conservative_depth

2011-11-18 Thread Marek Olšák
This adds a new TGSI property to represent the GLSL layout qualifier in TGSI. --- src/gallium/auxiliary/tgsi/tgsi_dump.c |1 + src/gallium/auxiliary/tgsi/tgsi_ureg.c | 16 src/gallium/auxiliary/tgsi/tgsi_ureg.h |5 +

[Mesa-dev] [PATCH 4/6] gallium: remove PIPE_CAP_GLSL and enable GLSL unconditionally

2011-11-18 Thread Marek Olšák
Only i965g does not enable GLSL, but that driver has been unmaintained and bitrotting for quite a while anyway. --- src/gallium/auxiliary/util/u_caps.c|1 - src/gallium/docs/source/screen.rst |1 - src/gallium/drivers/cell/ppu/cell_screen.c |2 -

[Mesa-dev] [PATCH 5/6] gallium: expose GLSL 1.3 if PIPE_CAP_SM4 is exposed (new cap)

2011-11-18 Thread Marek Olšák
--- src/gallium/include/pipe/p_defines.h |3 ++- src/mesa/state_tracker/st_extensions.c |5 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 3e55d22..e51132a 100644 ---

[Mesa-dev] [PATCH 6/6] st/mesa: enable ARB(AMD)_convervative_depth if GLSL 1.3 is supported

2011-11-18 Thread Marek Olšák
The spec says GL3 is required, but technically the extension only needs the 'out' modifier from GLSL 1.3. --- src/mesa/state_tracker/st_extensions.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c

Re: [Mesa-dev] [PATCH 5/6] gallium: expose GLSL 1.3 if PIPE_CAP_SM4 is exposed (new cap)

2011-11-18 Thread Marek Olšák
Please disregard this patch and the last one too. GLSL 1.3 in st/mesa is not as complete and usable as I thought. Marek On Fri, Nov 18, 2011 at 8:27 PM, Marek Olšák mar...@gmail.com wrote: ---  src/gallium/include/pipe/p_defines.h   |    3 ++-  src/mesa/state_tracker/st_extensions.c |    5

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Marek Olšák
On Fri, Nov 18, 2011 at 10:14 PM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index e8ac9fb..c63615c 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -51,6 +51,7

Re: [Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Marek Olšák
On Fri, Nov 18, 2011 at 9:44 PM, Ian Romanick i...@freedesktop.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: ---  src/glsl/linker.cpp                        |   45  src/mesa/main/mtypes.h                     |    3 ++  src/mesa/program/ir_to_mesa.cpp

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-19 Thread Marek Olšák
On Fri, Nov 18, 2011 at 9:44 PM, Ian Romanick i...@freedesktop.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: This patch also needs to change the _mesa_glsl_supported_extensions table in glsl_parser_extras.cpp.  AMD_conservative_depth is used for both versions of the extension

Re: [Mesa-dev] [PATCH 4/6] gallium: remove PIPE_CAP_GLSL and enable GLSL unconditionally

2011-11-19 Thread Marek Olšák
- On 11/18/2011 11:27 AM, Marek Olšák wrote: Only i965g does not enable GLSL, but that driver has been unmaintained and bitrotting for quite a while anyway. It doesn't even do GLSL?  I'm pretty shocked, I figured it at least did that.  Is it even worth keeping around in the tree

[Mesa-dev] [PATCH 1/3] mesa: rename the AMD_conservative_depth extension flag to ARB

2011-11-19 Thread Marek Olšák
--- src/glsl/glcpp/glcpp-parse.y|2 +- src/glsl/glsl_parser_extras.cpp |4 ++-- src/mesa/main/extensions.c |4 ++-- src/mesa/main/mtypes.h |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/glsl/glcpp/glcpp-parse.y

[Mesa-dev] [PATCH 3/3] glsl: convervative_depth is not allowed in the vertex shader

2011-11-19 Thread Marek Olšák
--- src/glsl/glsl_parser_extras.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 53ce881..0b4ccac 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -256,7

[Mesa-dev] [PATCH 0/8] EXT_transform_feedback ARB_transform_feedback2 core support

2011-11-19 Thread Marek Olšák
. I didn't look at what needs to be done to support the new one. Please review. Marek Olšák (8): mesa: implement DrawTransformFeedback from ARB_transform_feedback2 gallium: disable stream output in drivers that support it gallium: interface changes necessary to implement transform feedback

[Mesa-dev] [PATCH 2/8] gallium: disable stream output in drivers that support it

2011-11-19 Thread Marek Olšák
I am going to make interface changes and I don't want to break compilation. --- src/gallium/drivers/llvmpipe/lp_state_so.c |7 +++ src/gallium/drivers/nvc0/nvc0_state.c |7 +++ src/gallium/drivers/softpipe/sp_context.c |2 +- src/gallium/drivers/softpipe/sp_screen.c |

[Mesa-dev] [PATCH 3/8] gallium: interface changes necessary to implement transform feedback (v4)

2011-11-19 Thread Marek Olšák
Namely: - EXT_transform_feedback - ARB_transform_feedback2 - ARB_transform_feedback_instanced The old interface was not useful for OpenGL and had to be reworked. This interface was originally designed for OpenGL, but additional changes have been made in order to make st/d3d1x support easier.

[Mesa-dev] [PATCH 4/8] gallium: utility helper functions for stream output

2011-11-19 Thread Marek Olšák
--- src/gallium/auxiliary/tgsi/tgsi_ureg.c|7 ++- src/gallium/auxiliary/tgsi/tgsi_ureg.h| 18 ++ src/gallium/auxiliary/util/u_debug_describe.c | 10 ++ src/gallium/auxiliary/util/u_debug_describe.h |2 ++

[Mesa-dev] [PATCH 5/8] noop: implement stream output

2011-11-19 Thread Marek Olšák
--- src/gallium/drivers/noop/noop_state.c | 35 + 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/noop/noop_state.c b/src/gallium/drivers/noop/noop_state.c index 58ea8be..9d8dbfc 100644 ---

[Mesa-dev] [PATCH 6/8] u_blitter: restore stream output targets

2011-11-19 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c | 18 ++ src/gallium/auxiliary/util/u_blitter.h | 18 ++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index

[Mesa-dev] [PATCH 7/8] u_blitter: implement copy_buffer using stream output

2011-11-19 Thread Marek Olšák
--- src/gallium/auxiliary/util/u_blitter.c | 87 +++- src/gallium/auxiliary/util/u_blitter.h | 11 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index

[Mesa-dev] [PATCH 8/8] st/mesa: implement EXT_transform_feedback and ARB_transform_feedback2

2011-11-19 Thread Marek Olšák
/state_tracker/st_cb_xformfb.c b/src/mesa/state_tracker/st_cb_xformfb.c index a17b54d..2fc28dc 100644 --- a/src/mesa/state_tracker/st_cb_xformfb.c +++ b/src/mesa/state_tracker/st_cb_xformfb.c @@ -30,70 +30,122 @@ * Transform feedback functions. * * \author Brian Paul + * Marek Olšák

[Mesa-dev] [PATCH] gallium: separate out floating-point CAPs into its own enum

2011-11-19 Thread Marek Olšák
The motivation behind this is to add some self-documentation in the code about how each CAP can be used. The idea is: - enum pipe_cap is only valid in get_param - enum pipe_cap_float is only valid in get_paramf Which CAPs are floating-point have been determined based on how everybody except svga

[Mesa-dev] [PATCH 1/2] mesa: remove buggy assertions in unpack Z24

2011-11-20 Thread Marek Olšák
unpack_float_z_Z24_X8 fails with -O2 in: - fbo-blit-d24s8 - fbo-depth-sample-compare - fbo-readpixels-depth-formats - glean/depthStencil With -O0, it works fine. I am removing all the assertions. There's not much point in having them, is there? --- src/mesa/main/format_unpack.c |8

[Mesa-dev] [PATCH 2/2] st/mesa: quick fix of CopyPixels with GL_DEPTH_STENCIL

2011-11-20 Thread Marek Olšák
This fixes: - depthstencil-default_fb-copypixels - fbo-depthstencil-GL_DEPTH24_STENCIL8-copypixels --- src/mesa/state_tracker/st_cb_drawpixels.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c

[Mesa-dev] [PATCH] glsl: disable resource checking in the linker until it's done right

2011-11-20 Thread Marek Olšák
--- src/glsl/linker.cpp | 20 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 3527088..8089255 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -2230,8 +2230,28 @@ link_shaders(struct gl_context

Re: [Mesa-dev] [PATCH] glsl: disable resource checking in the linker until it's done right

2011-11-20 Thread Marek Olšák
On Mon, Nov 21, 2011 at 1:06 AM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/20/2011 01:15 PM, Marek Olšák wrote: ---  src/glsl/linker.cpp |   20  1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index

Re: [Mesa-dev] [PATCH] gallium: separate out floating-point CAPs into its own enum

2011-11-21 Thread Marek Olšák
On Mon, Nov 21, 2011 at 9:53 AM, Jose Fonseca jfons...@vmware.com wrote: I think that PIPE_CAP_FLOAT_XXX is too long and that the non-abbreviated _FLOAT_ word is distracting and misleading, as it sounds like it's related with floating point features, which is not.  Something more subtle, such

Re: [Mesa-dev] [PATCH] linker: Remove erroneous multiply by 4 in uniform usage calculation

2011-11-21 Thread Marek Olšák
Thanks for looking into this, Ian. Acked-by: Marek Olšák mar...@gmail.com On Mon, Nov 21, 2011 at 8:51 PM, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com The old count_uniform_size::num_shader_uniforms was actually calculating the number of components

[Mesa-dev] [PATCH 1/2] st/mesa: add color varyings to MaxVarying

2011-11-22 Thread Marek Olšák
The linker now adds color varyings to the number of used varyings and checks against that limit. --- src/mesa/state_tracker/st_extensions.c | 10 -- 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c

[Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-22 Thread Marek Olšák
These are different from hardware limits, because some drivers can correctly handle higher values than they report in most cases, either due to driver-specific compiler optimizations, or due to just how the hardware works internally. The problem with the linker is that it artifically reduces

Re: [Mesa-dev] [PATCH] glsl: disable resource checking in the linker until it's done right

2011-11-22 Thread Marek Olšák
On Mon, Nov 21, 2011 at 7:54 PM, Ian Romanick i...@freedesktop.org wrote: NAK with extreme prejudice.  Technically speaking, these are app bugs. I absolutely will not disable all correct behavior to work around broken apps. You are picturing a perfect world that doesn't exist. The world doesn't

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-22 Thread Marek Olšák
On Tue, Nov 22, 2011 at 4:05 PM, Jose Fonseca jfons...@vmware.com wrote: Marek, I think we should take one of two approaches here: - aim for a short-term workaround, without gallium interface changes:  - e.g., provide to GLSL compiler infinite/huge limits, while advertising to the app the

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-22 Thread Marek Olšák
On Tue, Nov 22, 2011 at 6:04 PM, Jose Fonseca jfons...@vmware.com wrote: - Original Message - On Tue, Nov 22, 2011 at 4:05 PM, Jose Fonseca jfons...@vmware.com wrote: Marek, I think we should take one of two approaches here: - aim for a short-term workaround, without gallium

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-22 Thread Marek Olšák
On Mon, Nov 21, 2011 at 8:01 PM, Ian Romanick i...@freedesktop.org wrote: On 11/19/2011 07:42 AM, Marek Olšák wrote: On Fri, Nov 18, 2011 at 9:44 PM, Ian Romanicki...@freedesktop.org  wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: This patch also needs to change

[Mesa-dev] [PATCH] mesa: re-implement unpacking of DEPTH_COMPONENT32F

2011-11-22 Thread Marek Olšák
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43122 --- src/mesa/main/format_unpack.c | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c index 6e2ce7a..52f224a 100644 ---

Re: [Mesa-dev] [PATCH] mesa: re-implement unpacking of DEPTH_COMPONENT32F

2011-11-22 Thread Marek Olšák
On Tue, Nov 22, 2011 at 9:13 PM, Patrick Baggett baggett.patr...@gmail.com wrote: On Tue, Nov 22, 2011 at 2:07 PM, Marek Olšák mar...@gmail.com wrote: Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43122 ---  src/mesa/main/format_unpack.c |   10 ++  1 files changed, 10

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-22 Thread Marek Olšák
On Tue, Nov 22, 2011 at 11:11 PM, Ian Romanick i...@freedesktop.org wrote: All of this discussion is largely moot.  The failure that you're so angry about was caused by a bug in the check, not by the check itself. That bug has already been fixed (commit 151867b). The exact same check was

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-23 Thread Marek Olšák
On Wed, Nov 23, 2011 at 6:59 AM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/22/2011 07:27 PM, Marek Olšák wrote: On Tue, Nov 22, 2011 at 11:11 PM, Ian Romanick i...@freedesktop.org wrote: All of this discussion is largely moot.  The failure that you're so angry about was caused

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-23 Thread Marek Olšák
On Wed, Nov 23, 2011 at 7:27 PM, Ian Romanick i...@freedesktop.org wrote: On 11/23/2011 05:42 AM, Marek Olšák wrote: On Wed, Nov 23, 2011 at 6:59 AM, Kenneth Graunkekenn...@whitecape.org  wrote: So, again, if the interest is in making more apps succeed, we should start with varying packing

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-24 Thread Marek Olšák
On Wed, Nov 23, 2011 at 7:25 PM, Ian Romanick i...@freedesktop.org wrote: Let me paraphrase this a little bit in a way that I think concisely captures the intention:    We need to work really hard to make things work on older hardware. I don't think anyone disagrees with that.  However, the

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-26 Thread Marek Olšák
On Fri, Nov 25, 2011 at 1:46 AM, Kenneth Graunke kenn...@whitecape.org wrote: another, no driver should be crippled ever. I know you couldn't care less about anything except your driver, but there are people who care. Marek I'm honestly shocked to read this, Marek.  We deliberately want

Re: [Mesa-dev] [PATCH 2/2] mesa: add hard limits for the number of varyings and uniforms for the linker

2011-11-27 Thread Marek Olšák
On Mon, Nov 28, 2011 at 12:08 AM, Ian Romanick i...@freedesktop.org wrote: In Mesa, we have four drivers that advertise 4096 uniform components on some combinations of hardware: i915, i915g, nouveau, and r300g.  By putting resource counting in the driver we have the potential for shaders to

[Mesa-dev] [PATCH] mesa: add const flags to skip MaxVarying and MaxUniform linker checks

2011-12-09 Thread Marek Olšák
This is only temporary until a better solution is available. --- I haven't given up yet because reporting incorrect driver limits may cause more troubles than this. I made it pretty small this time. It doesn't change any driver besides Gallium. Please review, especially the part in

Re: [Mesa-dev] [PATCH] mesa: add const flags to skip MaxVarying and MaxUniform linker checks

2011-12-10 Thread Marek Olšák
On Sat, Dec 10, 2011 at 8:19 PM, Ian Romanick i...@freedesktop.org wrote: On 12/09/2011 07:14 PM, Marek Olšák wrote: This is only temporary until a better solution is available. --- I haven't given up yet because reporting incorrect driver limits may cause more troubles than this. I made

Re: [Mesa-dev] [PATCH 1/2] mesa: remove buggy assertions in unpack Z24

2011-12-11 Thread Marek Olšák
On Mon, Nov 21, 2011 at 6:52 PM, Eric Anholt e...@anholt.net wrote: On Sun, 20 Nov 2011 15:08:55 +0100, Marek Olšák mar...@gmail.com wrote: unpack_float_z_Z24_X8 fails with -O2 in: - fbo-blit-d24s8 - fbo-depth-sample-compare - fbo-readpixels-depth-formats - glean/depthStencil With -O0

[Mesa-dev] [PATCH] mesa: fix an out-of-bounds access in prog_print.c

2011-12-11 Thread Marek Olšák
--- src/mesa/program/prog_print.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c index e9bf3aa..b4d142f 100644 --- a/src/mesa/program/prog_print.c +++ b/src/mesa/program/prog_print.c @@ -112,6 +112,7 @@

[Mesa-dev] [PATCH] mesa: add const flags to skip MaxVarying and MaxUniform linker checks (v2)

2011-12-11 Thread Marek Olšák
This is only temporary until a better solution is available. v2: print warnings and add gallium CAPs --- src/gallium/drivers/r300/r300_screen.c |2 + src/gallium/include/pipe/p_defines.h |4 ++- src/glsl/linker.cpp| 43 ---

Re: [Mesa-dev] [PATCH 1/2] mesa: remove buggy assertions in unpack Z24

2011-12-12 Thread Marek Olšák
On Mon, Dec 12, 2011 at 1:24 PM, Jose Fonseca jfons...@vmware.com wrote: I saw this email yesterday, but did not have time to reply. - Original Message - On Mon, Nov 21, 2011 at 6:52 PM, Eric Anholt e...@anholt.net wrote: On Sun, 20 Nov 2011 15:08:55 +0100, Marek Olšák mar

Re: [Mesa-dev] [PATCH 1/2] mesa: remove buggy assertions in unpack Z24

2011-12-12 Thread Marek Olšák
at 6:52 PM, Eric Anholt e...@anholt.net wrote: On Sun, 20 Nov 2011 15:08:55 +0100, Marek Olšák mar...@gmail.com wrote: unpack_float_z_Z24_X8 fails with -O2 in: - fbo-blit-d24s8 - fbo-depth-sample-compare - fbo-readpixels-depth-formats - glean/depthStencil With -O0

[Mesa-dev] [PATCH] st/mesa: expose conservative_depth if GLSL 1.3 is supported

2011-12-13 Thread Marek Olšák
It's not yet, but it can be enabled by the override environment variable. --- src/mesa/state_tracker/st_extensions.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index

Re: [Mesa-dev] [PATCH 0/2 v2] Add support for clip distances in Gallium

2011-12-13 Thread Marek Olšák
On Tue, Dec 13, 2011 at 11:22 PM, Jose Fonseca jfons...@vmware.com wrote: Another approach would be just to add the property, and kill output mask. Two ways of doing the same is what I'd like to avoid. I'll need a day (it's late here) to think about this and see how output mask is being

[Mesa-dev] [PATCH 1/2] mesa, gallium: add a cap for GPUs without unified color+generic varying slots

2011-12-13 Thread Marek Olšák
--- src/gallium/drivers/r300/r300_screen.c |3 ++- src/gallium/include/pipe/p_defines.h |3 ++- src/glsl/linker.cpp|6 ++ src/mesa/main/mtypes.h |9 + src/mesa/state_tracker/st_extensions.c |3 +++ 5 files changed, 22

[Mesa-dev] [PATCH 2/2] glsl: don't include system values in varyings usage

2011-12-13 Thread Marek Olšák
--- src/glsl/linker.cpp |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index e9298bb..1086ef7 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1811,6 +1811,13 @@ assign_varying_locations(struct gl_context

Re: [Mesa-dev] [PATCH 1/8] mesa: Record transform feedback stride in linker output.

2011-12-14 Thread Marek Olšák
The strides are useful, although they can be computed by summing up all the NumComponents fields for each buffer. Note that I also take into account ARB_transform_feedback3, which allows having interleaved attribs in more than one buffer. For the EXT_transform_feedback case and separate attribs,

Re: [Mesa-dev] [PATCH 1/8] mesa: Record transform feedback strides/offsets in linker output.

2011-12-14 Thread Marek Olšák
Reviewed-by: Marek Olšák mar...@gmail.com Marek On Wed, Dec 14, 2011 at 6:00 PM, Paul Berry stereotype...@gmail.com wrote: This patch adds two new fields to the gl_transform_feedback_info struct: - BufferStride records the total number of components (per vertex)  that transform feedback

Re: [Mesa-dev] [PATCH 1/2] mesa: Set the correct ctx-NewState bitfield for rasterizer discard.

2011-12-14 Thread Marek Olšák
I think RASTERIZER_DISCARD has nothing to do with transform feedback. I think it's part of the same spec because it's not useful without it. As I understand it, _NEW_TRANSFORM_FEEDBACK is dirty when transform feedback buffer bindings are changed or just enabled/disabled. On the other hand,

Re: [Mesa-dev] [PATCH 1/2] mesa, gallium: add a cap for GPUs without unified color+generic varying slots

2011-12-14 Thread Marek Olšák
On Wed, Dec 14, 2011 at 6:30 PM, Ian Romanick i...@freedesktop.org wrote: On 12/13/2011 04:32 PM, Marek Olšák wrote: ---  src/gallium/drivers/r300/r300_screen.c |    3 ++-  src/gallium/include/pipe/p_defines.h   |    3 ++-  src/glsl/linker.cpp                    |    6 ++  src/mesa/main

Re: [Mesa-dev] [PATCH v2 1/8] mesa: Track changes to transform feedback state.

2011-12-14 Thread Marek Olšák
On Wed, Dec 7, 2011 at 8:09 PM, Paul Berry stereotype...@gmail.com wrote: This patch adds a new bit to the ctx-NewState bitfield, _NEW_TRANSFORM_FEEDBACK, to track state changes that affect ctx-TransformFeedback.  This bit can be used by driver back-ends to avoid expensive recomputations when

Re: [Mesa-dev] [PATCH 1/2] mesa: Set the correct ctx-NewState bitfield for rasterizer discard.

2011-12-14 Thread Marek Olšák
On Wed, Dec 14, 2011 at 11:25 PM, Paul Berry stereotype...@gmail.com wrote: On 14 December 2011 13:42, Marek Olšák mar...@gmail.com wrote: I think RASTERIZER_DISCARD has nothing to do with transform feedback. I think it's part of the same spec because it's not useful without it. As I

Re: [Mesa-dev] [PATCH 1/2] mesa, gallium: add a cap for GPUs without unified color+generic varying slots

2011-12-14 Thread Marek Olšák
On Thu, Dec 15, 2011 at 12:01 AM, Ian Romanick i...@freedesktop.org wrote: Simple. I cannot pass the test glsl-max-varyings if I report 40 varying components, because I have only 32 texcoord components + 8 color components. I could re-use the color varyings, but it's not full single-precision.

Re: [Mesa-dev] [PATCH 1/2] mesa: Set the correct ctx-NewState bitfield for rasterizer discard.

2011-12-14 Thread Marek Olšák
On Thu, Dec 15, 2011 at 12:18 AM, Paul Berry stereotype...@gmail.com wrote: On 14 December 2011 15:00, Marek Olšák mar...@gmail.com wrote: On Wed, Dec 14, 2011 at 11:25 PM, Paul Berry stereotype...@gmail.com wrote: On 14 December 2011 13:42, Marek Olšák mar...@gmail.com wrote: I think

Re: [Mesa-dev] [PATCH] mesa: Remove unnecessary FLUSH_VERTICES in bind_buffer_range

2011-12-16 Thread Marek Olšák
Reviewed-by: Marek Olšák mar...@gmail.com Thanks! Marek On Fri, Dec 16, 2011 at 11:06 PM, Paul Berry stereotype...@gmail.com wrote: It isn't necessary to call FLUSH_VERTICES from bind_buffer_range, because transform feedback buffers are not allowed to be changed when transform feedback

[Mesa-dev] [PATCH] st/mesa: DrawTFB should use the vertex count from the last call of EndTFB

2011-12-17 Thread Marek Olšák
From ARB_transform_feedback2: ... the vertex count used for the rendering operation is set by the previous EndTransformFeedback command. --- src/mesa/state_tracker/st_cb_xformfb.c | 53 +-- 1 files changed, 42 insertions(+), 11 deletions(-) diff --git

[Mesa-dev] [PROPOSAL] gallium: move state enable bits from clip_state to rasterizer_state

2011-12-17 Thread Marek Olšák
--- This was suggested by Keith Whitwell in this email addressed to me on 8/6/2010: http://lists.freedesktop.org/archives/mesa-dev/2010-August/001810.html src/gallium/include/pipe/p_defines.h |2 +- src/gallium/include/pipe/p_state.h | 14 -- 2 files changed, 13

Re: [Mesa-dev] [PROPOSAL] gallium: move state enable bits from clip_state to rasterizer_state

2011-12-17 Thread Marek Olšák
On Sat, Dec 17, 2011 at 4:45 PM, Christoph Bumiller e0425...@student.tuwien.ac.at wrote: On 17.12.2011 15:45, Marek Olšák wrote: --- This was suggested by Keith Whitwell in this email addressed to me on 8/6/2010: http://lists.freedesktop.org/archives/mesa-dev/2010-August/001810.html  src

[Mesa-dev] [PATCH] gallium: remove PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_ATTRIBS

2011-12-17 Thread Marek Olšák
It's the same as PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS. --- src/gallium/drivers/nvc0/nvc0_screen.c |2 -- src/gallium/drivers/r300/r300_screen.c |1 - src/gallium/drivers/r600/r600_pipe.c |1 - src/gallium/include/pipe/p_defines.h |1 - src/mesa/state_tracker/st_extensions.c |

Re: [Mesa-dev] vertex array regression

2011-12-19 Thread Marek Olšák
2011/12/19 Mathias Fröhlich mathias.froehl...@gmx.net: Brian, On Monday, December 19, 2011 17:01:07 you wrote: I still don't get what the purpose of the special mapping of the last four/five elements is all about.  Can you explain that? As far as I can see the last ones should not map to

Re: [Mesa-dev] [PATCH 1/2] mesa: Set the correct ctx-NewState bitfield for rasterizer discard.

2011-12-19 Thread Marek Olšák
On Thu, Dec 15, 2011 at 7:21 PM, Paul Berry stereotype...@gmail.com wrote: On 15 December 2011 08:02, Eric Anholt e...@anholt.net wrote: On Thu, 15 Dec 2011 00:00:49 +0100, Marek Olšák mar...@gmail.com wrote: On Wed, Dec 14, 2011 at 11:25 PM, Paul Berry stereotype...@gmail.com wrote: (c

Re: [Mesa-dev] [PATCH] vbo: signal _NEW_ARRAY when transitioning between glBegin/End, glDrawArrays

2011-12-21 Thread Marek Olšák
Hi Brian, Is there a reason to set _NEW_ARRAY when transitioning between DrawArrays and DrawElements? Marek On Wed, Dec 21, 2011 at 1:58 AM, Brian Paul bri...@vmware.com wrote: This fixes a regression seen with the isosurf demo when switching between glBegin/End and glDrawArrays (do it

  1   2   3   4   5   6   7   8   9   10   >