-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
>> +-
On Sat, Oct 29, 2011 at 12:58 AM, Vadim Girlin 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
>> > wrote:
>> > > On Fri, 2011-10-28 at 19:47 +0200, Marek Olšák wrote:
>>
-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 deleti
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
> > 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 us
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
---
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
b
---
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
++
---
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
src/mesa/drivers/dri/common/
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 -
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
b/src/mesa/drivers/dri/
---
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 -
src/mesa/drivers/dri/common/drirenderbuffer.
---
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 619
---
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
+++ b/src/mesa/driv
---
.../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 +---
src/mesa/drivers/dri/common/dri_util
---
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
--- a/src/mesa/drivers/dri/common/dri_u
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 ++-
src/
---
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 a/src/mesa/drivers/dri/c
---
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 -
src/mesa/drivers/dri/radeon/
---
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 +++-
s
---
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 5d5f99d..945c
---
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
--- a/s
---
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
---
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
--- a/src/mesa/drivers/dri/common/dri_u
---
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
--- a/src/mesa/drivers/dri/common/dri_u
---
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
--- a/src/mesa/drivers/dri/common/dri_
---
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
--- a/src/mesa/drivers/dri/common/dri_u
---
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
--- a/src/mesa/drivers/dri/common/dri_u
Also DRI1-only.
---
src/gallium/state_trackers/dri/drm/dri2.c |2 -
src/mesa/drivers/dri/common/dri_util.c | 39 ---
src/mesa/drivers/dri/common/dri_util.h |1 -
src/mesa/drivers/dri/radeon/radeon_screen.c |3 --
4 files changed, 0 insertions(+), 4
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 de
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 insertions(
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 -
src/mesa/dr
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 de
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
On Fri, 28 Oct 2011 10:42:44 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> _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 test
On Fri, 28 Oct 2011 10:42:45 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> 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 o
On Fri, 2011-10-28 at 23:16 +0200, Marek Olšák wrote:
> On Fri, Oct 28, 2011 at 10:52 PM, Vadim Girlin 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 cle
On Fri, 28 Oct 2011 10:42:32 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> Signed-off-by: Ian Romanick
> ---
> src/glsl/ir_uniform.h | 128
> +
> 1 files changed, 128 insertions(+), 0 deletions(-)
> create mode 100644 src/glsl/ir_unifo
On Fri, Oct 28, 2011 at 10:52 PM, Vadim Girlin 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 being no longer u
On Fri, 28 Oct 2011 10:42:41 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> This functions are used to create and destroy the connections between
"These"
pgpyKHsOz0pvy.pgp
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.fr
- Original Message -
> From: Dave Airlie
>
> 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
> ---
> src/
On Fri, 28 Oct 2011 10:42:40 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> 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
> ---
> src/mesa/main/uniform_query.cpp |
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 regression
On Fri, 28 Oct 2011 10:42:39 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> This is just the infrastructure and the code. It's not used yet.
>
> Signed-off-by: Ian Romanick
> ---
> src/glsl/link_uniforms.cpp | 95
>
> src/glsl/linker.h
On Fri, 28 Oct 2011 10:42:36 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> 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 signature
___
On 10/28/2011 01:23 PM, Eric Anholt wrote:
On Fri, 28 Oct 2011 10:42:32 -0700, "Ian Romanick" wrote:
From: Ian Romanick
Signed-off-by: Ian Romanick
---
src/glsl/ir_uniform.h | 128 +
1 files changed, 128 insertions(+), 0 deletions(-)
create
On Fri, 28 Oct 2011 10:42:32 -0700, "Ian Romanick" wrote:
> From: Ian Romanick
>
> Signed-off-by: Ian Romanick
> ---
> src/glsl/ir_uniform.h | 128
> +
> 1 files changed, 128 insertions(+), 0 deletions(-)
> create mode 100644 src/glsl/ir_unifo
On 10/26/2011 02:46 PM, Ian Romanick wrote:
> From: Ian Romanick
>
> 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
For the series:
Re
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 a/src/mesa/drivers/dri/radeon/radeon_tex_c
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 a/src/mesa/swrast/s_readp
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 insertions(+
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 +
src/mesa/drivers/dri/
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 inser
---
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 @@ _swrast_R
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 b
---
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
+++ b/src/mesa/swrast/s_readp
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 othe
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 b/src/mesa/main
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 a0dc3e1..91205fc
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 10
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
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
--- a/src/mesa
---
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
+++ b/src/mesa/swrast/s_rea
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 | 7
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)
---
.../drivers/dri/radeon/radeon_common_context.
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 ++--
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 inser
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 insertio
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 +
src/mesa/drivers/dri/swras
---
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 imag
---
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
--- a/src/mesa/drivers/dri/intel/intel_
---
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
--- a/src/mesa/drivers/dri/intel/inte
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 ho
On Thu, 27 Oct 2011 10:49:14 -0700, Kenneth Graunke
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, BRW_REGISTER_TYPE
On 27 October 2011 20:13, Kenneth Graunke 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 s-expression parser so t
From: Dave Airlie
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
---
src/mesa/state_tracker/st_program.c | 15 ++
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 +-
On 27 October 2011 10:20, Ian Romanick 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 =
From: Ian Romanick
Signed-off-by: Ian Romanick
---
src/glsl/linker.cpp| 152
src/mesa/main/core.h |1 -
src/mesa/main/mtypes.h |1 -
src/mesa/main/shaderapi.c |1 -
src/mesa/main/shaderobj.c
From: Ian Romanick
Signed-off-by: Ian Romanick
---
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 50a724b..96de541 100644
--- a/src/mesa/main/uniform_query.c
From: Ian Romanick
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 patches, this should be reviewed
From: Ian Romanick
_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 integer
division to an RCP fo
From: Ian Romanick
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
---
src/mesa/main/uniform_query.cpp | 72 +++
1 files changed, 72 insertions(+
From: Ian Romanick
Connects all of the gl_program_parameter structures with the correct
gl_uniform_storage structures.
Signed-off-by: Ian Romanick
---
src/mesa/program/ir_to_mesa.cpp | 71 +++
src/mesa/program/ir_to_mesa.h |5 +++
2 files changed, 76
From: Ian Romanick
This functions are used to create and destroy the connections between
a uniform and the storage used by the driver to hold its value.
Signed-off-by: Ian Romanick
---
src/mesa/main/uniform_query.cpp |1 +
src/mesa/main/uniforms.c| 47
From: Ian Romanick
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
---
src/mesa/main/uniform_query.cpp | 117 +++
src/mesa/main/uniforms.h
From: Ian Romanick
This is just the infrastructure and the code. It's not used yet.
Signed-off-by: Ian Romanick
---
src/glsl/link_uniforms.cpp | 95
src/glsl/linker.h |3 +
2 files changed, 98 insertions(+), 0 deletions(-)
diff --gi
From: Ian Romanick
Signed-off-by: Ian Romanick
---
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 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/m
From: Ian Romanick
Signed-off-by: Ian Romanick
---
src/glsl/link_uniforms.cpp | 87
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 2de7165c..54af326 100644
--- a/src/gls
From: Ian Romanick
This class could probably be named better.
Signed-off-by: Ian Romanick
---
src/glsl/link_uniforms.cpp | 68
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
From: Ian Romanick
Signed-off-by: Ian Romanick
---
src/mesa/main/uniforms.c | 142 +-
1 files changed, 90 insertions(+), 52 deletions(-)
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index f968d9b..2a5318d 100644
--- a/src/mesa/ma
From: Ian Romanick
Also prepend _mesa_uniform_ to the names.
Signed-off-by: Ian Romanick
---
src/mesa/main/uniforms.c | 61 -
src/mesa/main/uniforms.h | 51 ++
2 files changed, 57 insertions(+), 55 deletions(-)
From: Ian Romanick
Signed-off-by: Ian Romanick
---
src/glsl/ir_uniform.h | 128 +
1 files changed, 128 insertions(+), 0 deletions(-)
create mode 100644 src/glsl/ir_uniform.h
diff --git a/src/glsl/ir_uniform.h b/src/glsl/ir_uniform.h
new file mo
From: Ian Romanick
Also rename to _mesa_get_uniform.
Signed-off-by: Ian Romanick
---
src/mesa/main/uniforms.c | 14 +++---
src/mesa/main/uniforms.h |4
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index d
From: Ian Romanick
There are cases where we might want to internally query the location
of a uniform in a shader that failed linking.
Signed-off-by: Ian Romanick
---
src/mesa/main/uniforms.c | 16 +++-
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/
From: Ian Romanick
Signed-off-by: Ian Romanick
---
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 beadec6..3d7bab8 100644
--- a/src/glsl/linker.cpp
+++ b/src/g
From: Ian Romanick
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
---
src/glsl/glsl_types.h | 23 +++
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/glsl/glsl_types.h b/src
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
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 matc
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
---
src/gallium/
On 10/27/2011 10:32 PM, Kenneth Graunke wrote:
On 10/27/2011 02:59 PM, Ian Romanick wrote:
From: Ian Romanick
Previously check_resources could fail, but we'd still try to optimize
the shader, do device-specific code generation, etc. In some cases,
this could explode (especially in the device-s
1 - 100 of 101 matches
Mail list logo
