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

2011-10-28 Thread Ian Romanick
On 10/26/2011 04:46 PM, Eric Anholt 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 caused. There Mesa fixes and the piglit test look good. Reviewed-by: Ian Romanick

Re: [Mesa-dev] [PATCH 2/4 v2] mesa/image: assert on bad format

2011-10-28 Thread Ian Romanick
On 10/19/2011 05:10 PM, nobled wrote: NULL as an error indicator is meaningless, since it will return NULL on success anyway if the caller passes in zero as the image's address and asks to calculate the offset of the first pixel. For example, _mesa_validate_pbo_access() does this. This also

[Mesa-dev] [PATCH 00/20] Rewrite GL API handling of uniforms

2011-10-28 Thread Ian Romanick
This is it. All the refactors that I've sent over the last month or so have been building towards this. This completely guts the existing uniform handling code and replaces it with something new. This work had a few goals: 1. Separate the way the GL API handles uniforms from the way the driver

[Mesa-dev] [PATCH 01/20] glsl: Allow glsl_types.h to be included in C sources

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Some C code will want access to the glsl_base_type and glsl_sampler_dim enums in the near future. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/glsl_types.h | 23 +++ 1 files changed, 15 insertions(+), 8

[Mesa-dev] [PATCH 02/20] linker: Make invalidate_variable_locations available outside the compilation unit

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/linker.cpp | 10 +- src/glsl/linker.h |4 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index

[Mesa-dev] [PATCH 04/20] mesa: Make get_uniform available outside compilation unit

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Also rename to _mesa_get_uniform. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mesa/main/uniforms.c | 14 +++--- src/mesa/main/uniforms.h |4 2 files changed, 11 insertions(+), 7 deletions(-) diff --git

[Mesa-dev] [PATCH 05/20] glsl: Add new structures for tracking uniforms in linked shaders

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/ir_uniform.h | 128 + 1 files changed, 128 insertions(+), 0 deletions(-) create mode 100644 src/glsl/ir_uniform.h diff --git

[Mesa-dev] [PATCH 07/20] mesa: Refactor parameter validate for GetUniform, Uniform, and UniformMatrix

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mesa/main/uniforms.c | 142 +- 1 files changed, 90 insertions(+), 52 deletions(-) diff --git a/src/mesa/main/uniforms.c

[Mesa-dev] [PATCH 09/20] linker: Add helper class for determining uniform usage

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com This class could probably be named better. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/link_uniforms.cpp | 68 1 files changed, 68 insertions(+), 0 deletions(-) diff --git

[Mesa-dev] [PATCH 10/20] linker: Add helper class for parcelling out backing storage to uniforms

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/link_uniforms.cpp | 87 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/src/glsl/link_uniforms.cpp

[Mesa-dev] [PATCH 11/20] mesa: Add structures for new style uniform tracking in shader programs

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mesa/main/mtypes.h | 25 + 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index aa3fa6a..d7314a2

[Mesa-dev] [PATCH 12/20] linker: Track uniform locations to new tracking structures

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com This is just the infrastructure and the code. It's not used yet. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/link_uniforms.cpp | 95 src/glsl/linker.h |3 + 2 files

[Mesa-dev] [PATCH 15/20] ir_to_mesa: Add _mesa_associate_uniform_storage

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Connects all of the gl_program_parameter structures with the correct gl_uniform_storage structures. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mesa/program/ir_to_mesa.cpp | 71 +++

[Mesa-dev] [PATCH 16/20] mesa: Add log_uniform and log_program_parameters to dump data

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com These were both useful debugging aids while developing this code. log_uniform will be used to keep the MESA_GLSL=uniform behavior. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mesa/main/uniform_query.cpp | 72

[Mesa-dev] [PATCH 17/20] i965: Move _mesa_ir_link_shader call before device-specific linking

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com _mesa_ir_link_shader needs to be called before cloning the IR tree so that the var-location field for uniforms is set. WARNING: This change breaks several integer division related piglit tests. The tests break because _mesa_ir_link_shader lowers

[Mesa-dev] [PATCH 18/20] mesa: Rewrite the way uniforms are tracked and handled

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Switch all of the code in ir_to_mesa, st_glsl_to_tgsi, glUniform*, glGetUniform, glGetUniformLocation, and glGetActiveUniforms to use the gl_uniform_storage structures in the gl_shader_program. A couple of notes: * Like most rewrite-the-world

[Mesa-dev] [PATCH 19/20] mesa: Add missing check for glUniform*v count 1 on non-array

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mesa/main/uniform_query.cpp |9 + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index

[Mesa-dev] [PATCH 20/20] Delete code made dead by previous uniform related patches

2011-10-28 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/linker.cpp| 152 src/mesa/main/core.h |1 - src/mesa/main/mtypes.h |1 - src/mesa/main/shaderapi.c

Re: [Mesa-dev] mis-counting varying vars in the linker

2011-10-28 Thread Paul Berry
On 27 October 2011 10:20, Ian Romanick i...@freedesktop.org wrote: On 10/26/2011 11:11 AM, Brian Paul wrote: I think the linker is mis-counting gl_TexCoord[] varying vars when linking. For example, if we have this vertex/fragment shader combination: // vs void main() { gl_Position =

[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

[Mesa-dev] [PATCH] mesa/st: get interpolation mode from the fragment shader.

2011-10-28 Thread Dave Airlie
From: Dave Airlie airl...@redhat.com With the recent changes to interpolation stuff, we can now get the value direct from the program instead of just being fail. fixes some of the glsl-1.30 interpolation tests with softpipe Signed-off-by: Dave Airlie airl...@redhat.com ---

Re: [Mesa-dev] [PATCH 2/5] glsl: Extend s-expression parsing to handle infinity.

2011-10-28 Thread Paul Berry
On 27 October 2011 20:13, Kenneth Graunke kenn...@whitecape.org wrote: On 10/26/2011 06:42 PM, Paul Berry wrote: In order to implement the GLSL 1.30 isinf() function, it will be necessary to be able to represent infinity in the GLSL IR s-expression format. This patch extends the

Re: [Mesa-dev] [PATCH] i965: Use the actual hardware g0 register for texel offset setup.

2011-10-28 Thread Eric Anholt
On Thu, 27 Oct 2011 10:49:14 -0700, Kenneth Graunke kenn...@whitecape.org wrote: The idea here is to set up the message header with the Sampler State pointer which the hardware provides as part of the PS Thread Payload in register g0. Unfortunately, the existing code fs_reg(GRF, 0,

[Mesa-dev] Renderbuffer mapping

2011-10-28 Thread Eric Anholt
The non-intel/swrast code is not tested. I don't have the hardware, now that r300 is gone. One the intel side, there's one regression on the last commit of the series, in gles2 conformance (I wouldn't push that commit until it's fixed). I haven't tracked it down yet -- I can't even figure out

[Mesa-dev] [PATCH 04/24] intel: Use MapRenderbuffer in spans setup.

2011-10-28 Thread Eric Anholt
--- src/mesa/drivers/dri/intel/intel_span.c | 33 +- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c index bdc4a0e..ecccd30 100644 ---

[Mesa-dev] [PATCH 03/24] intel: Add an implementation of MapRenderbuffer.

2011-10-28 Thread Eric Anholt
--- src/mesa/drivers/dri/intel/intel_fbo.c | 55 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 4537f1f..c9a1df5 100644 ---

[Mesa-dev] [PATCH 01/24] mesa: Add a driver hook for mapping renderbuffers.

2011-10-28 Thread Eric Anholt
--- src/mesa/main/dd.h |9 + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 8607008..d6cbcf1 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -514,6 +514,15 @@ struct dd_function_table { /** Unmap texture

[Mesa-dev] [PATCH 02/24] Add MapRenderbuffer implementations for software drivers.

2011-10-28 Thread Eric Anholt
Mesa core's is generic for things like osmesa. For swrast_dri.so, we have to do Y flipping. The front-buffer path isn't actually tested, though, because both before and after it fails with a BadMatch in XGetImage. --- src/mesa/drivers/common/driverfuncs.c |2 +

[Mesa-dev] [PATCH 06/24] nouveau: Add implementation of MapRenderbuffer.

2011-10-28 Thread Eric Anholt
Perhaps the easiest implementation, nouveau can directly map buffers even if tiled, and uses separate surfaces for its texture renderbuffers so we don't have to worry about that offset. --- src/mesa/drivers/dri/nouveau/nouveau_fbo.c | 46 1 files changed, 46

[Mesa-dev] [PATCH 09/24] swrast: Directly map the stencil buffer in read_stencil_pixels.

2011-10-28 Thread Eric Anholt
This avoids going through the wrapper that has to rewrite the data for packed depth/stencil. This isn't done in _swrast_read_stencil_span because we don't want to map/unmap for each span. --- src/mesa/swrast/s_readpix.c | 43 +++ 1 files changed, 39

[Mesa-dev] [PATCH 07/24] mesa: Make unpack_uint_z_row return 32 bits of data.

2011-10-28 Thread Eric Anholt
Some of the return values were u32, some were 24 bits, and z16 returned 16 bits. The caller would have to do all the work of interpreting the format all over again. However, there are no callers of this function at this point. --- src/mesa/main/format_unpack.c | 35

[Mesa-dev] [PATCH 05/24] radeon: Add implementation of MapRenderbuffer.

2011-10-28 Thread Eric Anholt
Unlike intel, we do a blit to/from GTT memory in order to untile/retile the renderbuffer data, since we don't have fence registers for accessing it. (There is software tiling code in radeon_tile.c, but it's unused and doesn't support macro tiling) ---

[Mesa-dev] [PATCH 12/24] swrast: MapRenderbuffer in separate depth/stencil readpixels fastpath

2011-10-28 Thread Eric Anholt
This introduces two new span helper functions we'll want to use in several palces as we move to MapRenderbuffer, which pull out integer depth and stencil values from a renderbuffer mapping based on the renderbuffer format. --- src/mesa/swrast/s_depth.h |1 - src/mesa/swrast/s_readpix.c |

[Mesa-dev] [PATCH 13/24] swrast: Switch the remaining depth/stencil readpixels path to MapRenderbuffer.

2011-10-28 Thread Eric Anholt
--- src/mesa/swrast/s_readpix.c | 72 +-- 1 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index b4db25d..a0dc3e1 100644 --- a/src/mesa/swrast/s_readpix.c +++

[Mesa-dev] [PATCH 11/24] swrast: Calculate image address/stride once for depth/stencil readpixels.

2011-10-28 Thread Eric Anholt
The fast and slow paths were doing these separately before. --- src/mesa/swrast/s_readpix.c | 30 ++ 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index c0bb399..7b74ed3 100644 ---

[Mesa-dev] [PATCH 10/24] swrast: Make the packed depth/stencil read fastpath use MapRenderbuffer.

2011-10-28 Thread Eric Anholt
This also makes it handle 24/8 vs 8/24, fixing piglit depthstencil-default_fb-readpixels-24_8 on i965. While here, avoid incorrectly fast-pathing if packing-SwapBytes is set. --- src/mesa/swrast/s_readpix.c | 94 +- 1 files changed, 65 insertions(+), 29

[Mesa-dev] [PATCH 17/24] swrast: Skip _swrast_validate_derived in _swrast_ReadPixels().

2011-10-28 Thread Eric Anholt
None of the callgraph below this uses derived state (almost nothing even dereferences the swrast context). --- src/mesa/swrast/s_readpix.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index bf2fe9d..21dc5ea

[Mesa-dev] [PATCH 14/24] swrast: Switch the remaining depth readpixels to MapRenderbuffer.

2011-10-28 Thread Eric Anholt
This avoids the wrapper, which should improve performance on packed depth/stencil drivers. --- src/mesa/swrast/s_readpix.c | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index

[Mesa-dev] [PATCH 15/24] mesa: Add a function for comparing gl_format to format/type.

2011-10-28 Thread Eric Anholt
This should be useful in making more generic fast paths in the pixel paths. --- src/mesa/main/formats.c | 306 +++ src/mesa/main/formats.h |3 + 2 files changed, 309 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/formats.c

[Mesa-dev] [PATCH 18/24] swrast: Convert color glReadPixels slow path to using MapRenderbuffer.

2011-10-28 Thread Eric Anholt
This may be a bit slower than before because we're switching from per-format compiled loops in GetRow to _mesa_unpack_rgba_block_unpack's loop around a callback to unpack a pixel. The solution there would be to make _mesa_unpack_rgba_block fold the span loop into the format handlers. (On the

[Mesa-dev] [PATCH 16/24] swrast: Add a readpixels fast-path based on memcpy and MapRenderbuffer.

2011-10-28 Thread Eric Anholt
--- src/mesa/swrast/s_readpix.c | 56 +++--- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 91205fc..bf2fe9d 100644 --- a/src/mesa/swrast/s_readpix.c +++

[Mesa-dev] [PATCH 19/24] swrast: Remove dead _swrast_read_depth_span_uint().

2011-10-28 Thread Eric Anholt
All the code using it is converted to MapRenderbuffer and the core unpack functions. --- src/mesa/swrast/s_depth.c | 83 - src/mesa/swrast/s_depth.h |5 --- 2 files changed, 0 insertions(+), 88 deletions(-) diff --git a/src/mesa/swrast/s_depth.c

[Mesa-dev] [PATCH 21/24] swrast: Drop the global mapping of buffers across glReadPixels().

2011-10-28 Thread Eric Anholt
--- src/mesa/swrast/s_readpix.c |8 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index b67e081..fce9762 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -519,12 +519,6 @@

[Mesa-dev] [PATCH 08/24] swrast: Use MapRenderbuffer for glReadPixels(GL_DEPTH_COMPONENT) fast-paths.

2011-10-28 Thread Eric Anholt
This fixes issues with the code playing fast and loose with types of buffers, and as a bonus avoids the wrappers that were previously used to pull bits out of packed depth/stencil buffers. --- src/mesa/swrast/s_readpix.c | 131 +-- 1 files changed, 63

[Mesa-dev] [PATCH 23/24] intel: Don't force a batchbuffer flush in readpixels.

2011-10-28 Thread Eric Anholt
Renderbuffer mapping handles flushing the batchbuffer if required, so all we need to do is make sure any pending rendering has reached the batchbuffer. --- src/mesa/drivers/dri/intel/intel_context.c| 10 +- src/mesa/drivers/dri/intel/intel_context.h|1 +

[Mesa-dev] [PATCH 24/24] i965/gen6: Improve glReadPixels() performance by blitting to a linear temp.

2011-10-28 Thread Eric Anholt
The readpixels microbenchmark in mesa-demos goes from 47Mpix/sec on 1000x1000 to 450Mpix/sec. The 10x10 sizes stay about the same. --- src/mesa/drivers/dri/intel/intel_fbo.c | 89 +++- src/mesa/drivers/dri/intel/intel_fbo.h |2 +- 2 files changed, 76

[Mesa-dev] [PATCH 20/24] swrast: Drop the remaining GetRow-based glReadPixels() fast-path.

2011-10-28 Thread Eric Anholt
In all of piglit, only two tests hit it (reading to RGBA float, where GetRow would drop floats into place from R, RG, or RGB). --- src/mesa/swrast/s_readpix.c | 90 --- 1 files changed, 0 insertions(+), 90 deletions(-) diff --git

[Mesa-dev] [PATCH 22/24] radeon: Remove early dereference of src/dst width in glCopyTexSubImage.

2011-10-28 Thread Eric Anholt
There doesn't appear to be any particular reason for this -- it's not like the width is changing between the deref and the use. --- src/mesa/drivers/dri/radeon/radeon_tex_copy.c |8 ++-- 1 files changed, 2 insertions(+), 6 deletions(-) diff --git

Re: [Mesa-dev] [PATCH 1/2] glsl: Generate an error for array-of-array declarations

2011-10-28 Thread Kenneth Graunke
On 10/26/2011 02:46 PM, Ian Romanick wrote: From: Ian Romanick ian.d.roman...@intel.com Other parts of the code already caught things like 'float x[4][2]'. However, nothing caught 'float [4] x[2]'. Fixes piglit test array-multidimensional-new-syntax.vert. Signed-off-by: Ian Romanick

Re: [Mesa-dev] [PATCH 05/20] glsl: Add new structures for tracking uniforms in linked shaders

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:32 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/ir_uniform.h | 128 + 1 files changed, 128

Re: [Mesa-dev] [PATCH 05/20] glsl: Add new structures for tracking uniforms in linked shaders

2011-10-28 Thread Ian Romanick
On 10/28/2011 01:23 PM, Eric Anholt wrote: On Fri, 28 Oct 2011 10:42:32 -0700, Ian Romanicki...@freedesktop.org wrote: From: Ian Romanickian.d.roman...@intel.com Signed-off-by: Ian Romanickian.d.roman...@intel.com --- src/glsl/ir_uniform.h | 128

Re: [Mesa-dev] [PATCH 09/20] linker: Add helper class for determining uniform usage

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:36 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com This class could probably be named better. Maybe just count_uniform_size? usage makes me think way it's dereferenced or something. pgp8IA7B0UhWe.pgp Description: PGP

Re: [Mesa-dev] [PATCH 12/20] linker: Track uniform locations to new tracking structures

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:39 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com This is just the infrastructure and the code. It's not used yet. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/link_uniforms.cpp | 95

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

2011-10-28 Thread Vadim Girlin
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 being no longer used for anything useful. There are no piglit regressions.

Re: [Mesa-dev] [PATCH 13/20] mesa: Add _mesa_propagate_uniforms_to_driver_storage

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:40 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com This function propagates the values from the backing storage of a gl_uniform_storage structure to the driver supplied data locations. Signed-off-by: Ian Romanick

Re: [Mesa-dev] [PATCH 14/20] mesa: Add _mesa_uniform_{attach, detach_all}_driver_storage functions

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:41 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com This functions are used to create and destroy the connections between These pgpyKHsOz0pvy.pgp Description: PGP signature ___

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 05/20] glsl: Add new structures for tracking uniforms in linked shaders

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:32 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/glsl/ir_uniform.h | 128 + 1 files changed, 128

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

2011-10-28 Thread Vadim Girlin
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 +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

Re: [Mesa-dev] [PATCH 18/20] mesa: Rewrite the way uniforms are tracked and handled

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:45 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Switch all of the code in ir_to_mesa, st_glsl_to_tgsi, glUniform*, glGetUniform, glGetUniformLocation, and glGetActiveUniforms to use the gl_uniform_storage structures in

Re: [Mesa-dev] [PATCH 17/20] i965: Move _mesa_ir_link_shader call before device-specific linking

2011-10-28 Thread Eric Anholt
On Fri, 28 Oct 2011 10:42:44 -0700, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com _mesa_ir_link_shader needs to be called before cloning the IR tree so that the var-location field for uniforms is set. WARNING: This change breaks several integer

[Mesa-dev] DRI1 Cleanup

2011-10-28 Thread Kristian Høgsberg
Hello, Here's a follow-up series to Eric's removal of the last DRI1 driver. Now that all DRI drivers are DRI2-only, there's a lot of DRI1 driver infrastructure that we can remove. Kristian .../state_trackers/dri/common/dri_drawable.c |6 +- src/gallium/state_trackers/dri/drm/Makefile

[Mesa-dev] [PATCH 01/27] dri: Drop driLegacyExtension

2011-10-28 Thread Kristian Høgsberg
There are no DRI1 drivers left. --- src/gallium/state_trackers/dri/drm/dri2.c |1 - src/mesa/drivers/dri/common/dri_util.c |8 src/mesa/drivers/dri/common/dri_util.h |1 - src/mesa/drivers/dri/radeon/radeon_screen.c |1 - 4 files changed, 0 insertions(+), 11

[Mesa-dev] [PATCH 02/27] dri: Drop driReadDrawableExtension

2011-10-28 Thread Kristian Høgsberg
All DRI2 drivers support setting a separate read drawable. --- src/gallium/state_trackers/dri/drm/dri2.c |2 -- src/mesa/drivers/dri/common/dri_util.c |8 src/mesa/drivers/dri/common/dri_util.h |1 - src/mesa/drivers/dri/intel/intel_screen.c |1 -

[Mesa-dev] [PATCH 03/27] dri: Drop driCopySubBufferExtension

2011-10-28 Thread Kristian Høgsberg
Another DRI1-only extension. --- src/gallium/state_trackers/dri/drm/dri2.c |2 -- src/mesa/drivers/dri/common/dri_util.c | 19 --- src/mesa/drivers/dri/common/dri_util.h |1 - src/mesa/drivers/dri/radeon/radeon_screen.c |1 - 4 files changed, 0

[Mesa-dev] [PATCH 04/27] dri: Remove driSwapControlExtension

2011-10-28 Thread Kristian Høgsberg
DRI1-only as well. --- src/gallium/state_trackers/dri/drm/dri2.c |2 -- src/mesa/drivers/dri/common/dri_util.c | 17 - src/mesa/drivers/dri/common/dri_util.h |1 - src/mesa/drivers/dri/radeon/radeon_screen.c |4 +--- 4 files changed, 1 insertions(+), 23

[Mesa-dev] [PATCH 06/27] dri: Remove unused __DRIswapInfoRec

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.h | 40 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index 2f33a62..1ace19e 100644 ---

[Mesa-dev] [PATCH 07/27] dri: Remove unsused driCreateNewScreen

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 93 1 files changed, 0 insertions(+), 93 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 1118b19..46ef661 100644 ---

[Mesa-dev] [PATCH 08/27] dri: Fold driCreateNewDrawable into dri2CreateNewDrawable

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 81 +++- 1 files changed, 28 insertions(+), 53 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 46ef661..15f600c 100644 ---

[Mesa-dev] [PATCH 09/27] dri: Drop unused driCreateNewContext

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 52 1 files changed, 0 insertions(+), 52 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 15f600c..348b06a 100644 ---

[Mesa-dev] [PATCH 10/27] dri: Remove unused driSwapBuffers

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 65 +--- 1 files changed, 1 insertions(+), 64 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 348b06a..b3e6b12 100644 ---

[Mesa-dev] [PATCH 11/27] dri: Drop __driUtilUpdateDrawableInfo and helper macros

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 88 src/mesa/drivers/dri/common/dri_util.h | 57 2 files changed, 0 insertions(+), 145 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c

[Mesa-dev] [PATCH 12/27] dri: Remove unused driIntersectArea

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 13 - src/mesa/drivers/dri/common/dri_util.h |3 --- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index c7154df..5d5f99d 100644 ---

[Mesa-dev] [PATCH 13/27] dri: Drop unused driCalculateSwapUsage

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 63 src/mesa/drivers/dri/common/dri_util.h |4 -- 2 files changed, 0 insertions(+), 67 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index

[Mesa-dev] [PATCH 14/27] dri: Remove cliprect information from __DRIdrawable

2011-10-28 Thread Kristian Høgsberg
--- src/gallium/state_trackers/dri/drm/dri2.c | 19 + src/mesa/drivers/dri/common/dri_util.c | 17 src/mesa/drivers/dri/common/dri_util.h | 28 +--- src/mesa/drivers/dri/common/spantmp_common.h | 11 +++-

[Mesa-dev] [PATCH 15/27] dri: Remove remaining DRI1 vblank code

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/Makefile.sources |1 - src/mesa/drivers/dri/common/vblank.c | 434 src/mesa/drivers/dri/common/vblank.h | 71 src/mesa/drivers/dri/r200/r200_ioctl.c |2 -

[Mesa-dev] [PATCH 16/27] dri: Remove DRI1 fields from DRI structs

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c | 29 +- src/mesa/drivers/dri/common/dri_util.h | 105 .../drivers/dri/radeon/radeon_common_context.c |6 - 3 files changed, 2 insertions(+), 138 deletions(-) diff --git

[Mesa-dev] [PATCH 17/27] dri: Remove dri2.enabled flag

2011-10-28 Thread Kristian Høgsberg
DRI2 is always enabled now. --- src/mesa/drivers/dri/common/dri_util.c |1 - src/mesa/drivers/dri/common/dri_util.h |1 - src/mesa/drivers/dri/radeon/radeon_common.c|3 - .../drivers/dri/radeon/radeon_common_context.c | 80 ++-

[Mesa-dev] [PATCH 18/27] dri: Remove unused fields from __DriverAPIRec

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.h | 34 1 files changed, 0 insertions(+), 34 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index ac0cef0..ab11d45 100644 ---

[Mesa-dev] [PATCH 19/27] dri: Remove unnecessary timestamp pointer indirection

2011-10-28 Thread Kristian Høgsberg
--- .../state_trackers/dri/common/dri_drawable.c |6 +++--- src/gallium/state_trackers/dri/drm/dri2.c |2 +- src/gallium/state_trackers/dri/sw/dri_drawable.c |6 +++--- src/mesa/drivers/dri/common/dri_util.c |4 +---

[Mesa-dev] [PATCH 20/27] dri: Remove unnecessary #defines and #includes

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/dri_util.c |8 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 9deb997..7ffa860 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++

[Mesa-dev] [PATCH 21/27] dri: Stop using driUpdateFramebufferSize() wrapper function

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/intel/intel_context.c |3 +-- .../drivers/dri/radeon/radeon_common_context.c | 10 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index

[Mesa-dev] [PATCH 22/27] dri: Drop unused dri renderbuffer helper functions

2011-10-28 Thread Kristian Høgsberg
--- src/gallium/state_trackers/dri/drm/Makefile |3 +- src/gallium/targets/Makefile.dri |3 +- src/mesa/drivers/dri/common/Makefile.sources |1 - src/mesa/drivers/dri/common/drirenderbuffer.c | 200 -

[Mesa-dev] [PATCH 23/27] r200: Don't use driIsTextureResident helper

2011-10-28 Thread Kristian Høgsberg
With DRI2, textures are always resident and using the DRI texmem helper here is broken anyway, since nothing else uses it. --- src/mesa/drivers/dri/r200/r200_tex.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_tex.c

[Mesa-dev] [PATCH 24/27] dri: Move _dri_texformat_* to radeon_texture.c

2011-10-28 Thread Kristian Høgsberg
They are only used by the r200 driver now. --- src/mesa/drivers/dri/radeon/radeon_fbo.c |6 +- src/mesa/drivers/dri/radeon/radeon_texture.c | 78 ++ src/mesa/drivers/dri/radeon/radeon_texture.h |8 +++ 3 files changed, 65 insertions(+), 27 deletions(-) diff

[Mesa-dev] [PATCH 25/27] dri: Remove unused dri texmem.c

2011-10-28 Thread Kristian Høgsberg
--- src/gallium/state_trackers/dri/drm/Makefile|3 +- src/gallium/targets/Makefile.dri |3 +- src/mesa/drivers/dri/common/Makefile.sources |3 +- src/mesa/drivers/dri/common/texmem.c | 1338

[Mesa-dev] [PATCH 26/27] dri: Remove a few unused dri helper functions

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/utils.c | 118 --- 1 files changed, 0 insertions(+), 118 deletions(-) diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 54156d3..d8656a7 100644 --- a/src/mesa/drivers/dri/common/utils.c

[Mesa-dev] [PATCH 27/27] dri: Remove unused memops.h

2011-10-28 Thread Kristian Høgsberg
--- src/mesa/drivers/dri/common/memops.h | 17 - src/mesa/drivers/dri/common/utils.h | 25 - 2 files changed, 0 insertions(+), 42 deletions(-) delete mode 100644 src/mesa/drivers/dri/common/memops.h diff --git a/src/mesa/drivers/dri/common/memops.h

[Mesa-dev] intel GPU freeze with master, with apitrace log

2011-10-28 Thread tom fogal
Hi all, Our application has a render mode which is causing a Sandybridge-based system to hang for a second with Mesa master. In dmesg I see: [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung [drm:i915:do_wait_request] *ERROR* i915_do_wait_request returns -11 (awaiting

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

2011-10-28 Thread Vadim Girlin
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 +0200, Marek Olšák wrote: I've got no idea what the flush was good for,

Re: [Mesa-dev] [PATCH 04/24] intel: Use MapRenderbuffer in spans setup.

2011-10-28 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 This patch will break depthstencil renderbuffers on gen7. Comments below. On 10/28/2011 12:49 PM, Eric Anholt wrote: --- src/mesa/drivers/dri/intel/intel_span.c | 33 +- 1 files changed, 10 insertions(+), 23

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

Re: [Mesa-dev] [PATCH 04/24] intel: Use MapRenderbuffer in spans setup.

2011-10-28 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/28/2011 04:58 PM, Chad Versace wrote: This patch will break depthstencil renderbuffers on gen7. Comments below. On 10/28/2011 12:49 PM, Eric Anholt wrote: --- src/mesa/drivers/dri/intel/intel_span.c | 33 +-