V2: - Remove spurious duplicate prototypes in teximage.h
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/multisample.c | 15 +++
src/mesa/main/multisample.h | 5 +
src/mesa/main/teximage.c| 20
src/mesa/main/teximage.h| 10
This series adds the core mesa bits and i965 driver support for
ARB_texture_multisample.
Big changes from V1:
- Generally cleaner
- GLSL texelFetch() with a multisample sampler is converted to
a new ir_txf_ms opcode in the GLSL IR, which makes the driver side
a lot tidier.
-
V2: - Drop placeholder
- Align enum values
- Remove explicit exec=mesa; it *is* the dispatch flavor we want,
but it's also the default. I misunderstood how this worked before;
after actually reading the generator it makes good sense.
Signed-off-by: Chris Forbes chr
V2: - reorder after introducing stubs
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/tests/dispatch_sanity.cpp | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
b/src/mesa/main/tests/dispatch_sanity.cpp
index
in a newer extension. Fixed weird
indentation.
- Allow multisample array textures in glFramebufferTextureLayer.
This was overlooked as the tests originally only used 2d
multisample textures.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/fbobject.c
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/tests/enum_strings.cpp | 21 +
1 file changed, 21 insertions(+)
diff --git a/src/mesa/main/tests/enum_strings.cpp
b/src/mesa/main/tests/enum_strings.cpp
index 5d70007..1dae60f 100644
--- a/src/mesa/main/tests
V2: - emit `sample` parameter properly for multisample texelFetch()
V3: - fix spurious whitespace change
- introduce a new opcode ir_txf_ms rather than overloading the
existing ir_txf further. This makes doing the right thing in
the driver somewhat simpler.
Signed-off-by: Chris
for winsys FBOs, at Paul's suggestion
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/common/driverfuncs.c | 3 +++
src/mesa/main/dd.h| 8
src/mesa/main/multisample.c | 25 +++--
3 files changed, 34 insertions(+), 2
V2: For now, only expose a depth sample count of 1, since there are
unresolved interactions with W-tiling for stencil textures and possibly
also HiZ for depth textures.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_context.c | 12 ++--
1 file changed, 10
V2: - fix multiline comment style
- stop using ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH since that
doesn't exist anymore.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/enable.c | 15 +++
src/mesa/main/get.c | 9 +
src/mesa/main
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_context.h| 2 +-
src/mesa/drivers/dri/i965/gen6_blorp.cpp | 2 +-
src/mesa/drivers/dri/i965/gen6_multisample_state.c | 19 +--
src/mesa/drivers/dri/i965/gen7_blorp.cpp
Moves the definition of the sample positions out of
gen6_emit_3dstate_multisample, and unpacks them in
gen6_get_sample_position.
V2: Be consistent about `sample position` rather than `location`.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_context.c
, debug message, fix for state moving
from texobj to image.
- stencil texturing tweaks tidied up and folded in here.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/fbobject.c | 50
1 file changed, 38 insertions(+), 12 deletions
like GL_TEXTURE_BUFFER.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/texobj.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index f86b4eb..f8a935b 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main
V2: - fix formatting issues
- generate GL_OUT_OF_MEMORY if teximage cannot be allocated
- fix for state moving from texobj to image
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/teximage.c | 153 +--
1 file changed, 149
-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_tex_layout.c | 1 +
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 ++
src/mesa/drivers/dri/intel/intel_fbo.c | 24 +---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 24
- set GEN7_SURFACE_ARYSPC_LOD0 if it's set in the miptree.
V2: - Clarify commit message
- Rebased onto Paul's physical/logical dims cleanup
- Added Gen7 support
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
src/mesa
-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index e68285c..be13c07 100644
This is very similar to the TXF opcode, but lowers to `ld2dms` rather
than `ld` on Gen7.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_defines.h | 1 +
src/mesa/drivers/dri/i965/brw_fs.cpp| 1 +
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 7
: Reworked completely, added support for Gen7.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
b/src/mesa/drivers
layout, we can emit a slightly shorter message here in the UMS case.
V2: Reworked completely, added support for Gen7.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 44
1 file changed, 38 insertions(+), 6 deletions
V2: Works on Ivy Bridge now too, so this can be 6+.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/intel/intel_extensions.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c
b/src/mesa/drivers/dri/intel/intel_extensions.c
I've re-read the spec and am pretty certain now that allowing
STENCIL_INDEX is bogus.
I had got confused about what was actually required where the
extension spec says:
internalformat must be color-renderable, depth-renderable, or
stencil- renderable (as defined in section 4.4.4).
--
Yes, that's much more sensible, thanks.
-- Chris
On Wed, Feb 6, 2013 at 12:00 PM, Eric Anholt e...@anholt.net wrote:
Chris Forbes chr...@ijw.co.nz writes:
GL_TEXTURE_2D_MULTISAMPLE and GL_TEXTURE_2D_MULTISAMPLE_ARRAY targets
don't allow filtering state to be set, but the default state fails
This series adds the core mesa bits for ARB_texture_multisample, and support
in the i965 driver on Gen6 and Gen7.
I've tidied up all the things that were commented on in V2.
Big changes:
- First three patches were squashed together. The result adds the glapi
bits, the dispatch_sanity
the generator it makes good sense.
V3: - Squash in stubs for new entrypoints, and dispatch_sanity tweaks,
so we don't get build breakage between those patches.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[1/3 V2] Reviewed-by: Matt Turner matts...@gmail.com
[V3] Reviewed-by: Eric Anholt e
actually be changed by the user, so it's more sensible to
initialize it correctly than to hack around it being bogus later.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/main/fbobject.c | 11 -
src/mesa/main/get.c
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/main/tests/enum_strings.cpp | 21 +
1 file changed, 21 insertions(+)
diff --git a/src/mesa/main/tests/enum_strings.cpp
b/src
whitespace
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/glsl/builtin_types.h | 19 +
.../builtins/profiles/ARB_texture_multisample.glsl | 18
src/glsl
- GL_MAX_COLOR_TEXTURE_SAMPLES
- GL_MAX_DEPTH_TEXTURE_SAMPLES
- GL_MAX_INTEGER_SAMPLES
V2: initialize limits to 1 in _mesa_init_constants as suggested by Brian
and Paul
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/main/context.c
V2: For now, only expose a depth sample count of 1, since there are
unresolved interactions with W-tiling for stencil textures and possibly
also HiZ for depth textures.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965
for winsys FBOs, at Paul's suggestion
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/common/driverfuncs.c | 3 +++
src/mesa/main/dd.h| 8
src/mesa/main/multisample.c | 25
V2: - fix multiline comment style
- stop using ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH since that
doesn't exist anymore.
V3: - check for the extension being enabled
- tidier flagging of _NEW_MULTISAMPLE
- fix weird indentation in get.c
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965/brw_context.h| 2 +-
src/mesa/drivers/dri/i965/gen6_blorp.cpp | 2 +-
src/mesa/drivers/dri/i965
Moves the definition of the sample positions out of
gen6_emit_3dstate_multisample, and unpacks them in
gen6_get_sample_position.
V2: Be consistent about `sample position` rather than `location`.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src
-specific blocks, as suggested by Eric
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[V2] Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/main/fbobject.c | 60 ++--
1 file changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/mesa/main
, to deallocate the texture
- dont forget to call _mesa_update_fbo_texture
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/teximage.c | 151 +--
1 file changed, 147 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa
-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965/brw_tex_layout.c | 1 +
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 ++
src/mesa/drivers/dri/intel/intel_fbo.c | 24 +---
src/mesa/drivers
- set GEN7_SURFACE_ARYSPC_LOD0 if it's set in the miptree.
V2: - Clarify commit message
- Rebased onto Paul's physical/logical dims cleanup
- Added Gen7 support
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri
be
accessed. Software must ensure that the surface is defined
to avoid GTT errors.
To allow the shader to treat all surfaces uniformly, force UMS if the
surface is to be used as a multisample texture, even if CMS would have
been possible.
V3: - Quoted erratum text
Signed-off-by: Chris Forbes
This is very similar to the TXF opcode, but lowers to `ld2dms` rather
than `ld` on Gen7.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965/brw_defines.h | 1 +
src/mesa/drivers/dri/i965/brw_fs.cpp| 1 +
src/mesa
: Reworked completely, added support for Gen7.
V3: - Use new sample_index, sample_index_type rather than reusing lod
- Clarify commit message.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 24
1 file changed, 20
: - Introduce sample_index parameter rather than reusing lod
- Removed spurious whitespace change
- Clarify commit message
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_fs.h | 6 ++--
src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 5 +--
src/mesa/drivers
V2: Works on Ivy Bridge now too, so this can be 6+.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/intel/intel_extensions.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c
b
Oops -- there's still one TODO in here, for the interaction with
ARB_internalformat_query. I'll fix that soon.
On Fri, Feb 8, 2013 at 10:19 PM, Chris Forbes chr...@ijw.co.nz wrote:
V2: - fix formatting issues
- generate GL_OUT_OF_MEMORY if teximage cannot be allocated
- fix for state
Yikes, apparently I missed one. Thanks for spotting that.
-- Chris
On Tue, Feb 12, 2013 at 3:35 PM, Eric Anholt e...@anholt.net wrote:
Chris Forbes chr...@ijw.co.nz writes:
- sample count must be the same on all attachments
- fixedsamplepositions must be the same on all attachments
Ouch. Thanks for catching that -- are there any other similar things I
need to be aware of?
On Wed, Feb 13, 2013 at 8:19 PM, Kenneth Graunke kenn...@whitecape.org wrote:
On 02/08/2013 01:19 AM, Chris Forbes wrote:
V2: - emit `sample` parameter properly for multisample texelFetch()
- fix
This series implements the interactions between internalformat_query,
texture_multisample, and multisample renderbuffer creation.
Applies on top of V4 of the texture_multisample series (which I'll send out
soon),
or V3 with small modifications.
2/3 might be interesting on its own, for the 9.1
, but the driver
may still be able to implement a reasonable resolve operation, so it can
be supported for renderbuffers.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_context.c | 6 --
src/mesa/main/dd.h | 4 +++-
src/mesa/main
(or GL4.2):
If samples is greater than the maximum number of samples supported
for internalformat then the error INVALID_OPERATION is generated
(see GetInternalformativ in section 6.X).
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/fbobject.c | 43
with a pname of SAMPLES (see section 6.X).
This resolves the remaining TODO in the implementation of
TexImage*DMultisample.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/fbobject.c | 11 +++
src/mesa/main/teximage.c | 30 +-
2 files changed, 16
This series adds the core mesa bits for ARB_texture_multisample, and support
in the i965 driver for Gen6 and Gen7.
I've addressed the issues that were raised for V3, and also fixed some other
bugs which I found while beefing up the piglit coverage for this.
- Proxy texture targets were denied in
the generator it makes good sense.
V3: - Squash in stubs for new entrypoints, and dispatch_sanity tweaks,
so we don't get build breakage between those patches.
V4: - Fix various remaining whitespace issues
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[1/3 V2] Reviewed-by: Matt Turner matts
with correct values. For V4,
just do the setup in finish_texture_init().
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[V2] Reviewed-by: Paul Berry stereotype...@gmail.com
[V4] Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/main/fbobject.c | 11 --
src/mesa/main/get.c
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/main/tests/enum_strings.cpp | 21 +
1 file changed, 21 insertions(+)
diff --git a/src/mesa/main/tests/enum_strings.cpp
b/src
whitespace
V4: - don't forget to include the new opcode in tex_opcode_strs[]
(thanks Kenneth for spotting this)
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[V2] Reviewed-by: Eric Anholt e...@anholt.net
[V2] Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/glsl/builtin_types.h
- GL_MAX_COLOR_TEXTURE_SAMPLES
- GL_MAX_DEPTH_TEXTURE_SAMPLES
- GL_MAX_INTEGER_SAMPLES
V2: initialize limits to 1 in _mesa_init_constants as suggested by Brian
and Paul
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
Reviewed-by: Eric Anholt e
V2: For now, only expose a depth sample count of 1, since there are
unresolved interactions with W-tiling for stencil textures and possibly
also HiZ for depth textures.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
Reviewed-by: Eric Anholt e
for winsys FBOs, at Paul's suggestion
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/drivers/common/driverfuncs.c | 3 +++
src/mesa/main/dd.h| 8
src/mesa/main
-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/main/enable.c | 18 ++
src/mesa/main/get.c | 9 +
src/mesa/main/get_hash_params.py | 2 ++
src/mesa/main/mtypes.h | 6 ++
src/mesa/main
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965/brw_context.h| 2 +-
src/mesa/drivers/dri/i965/gen6_blorp.cpp | 2 +-
src/mesa/drivers/dri/i965
Moves the definition of the sample positions out of
gen6_emit_3dstate_multisample, and unpacks them in
gen6_get_sample_position.
V2: Be consistent about `sample position` rather than `location`.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src
-specific blocks, as suggested by Eric
V4: - Removed stencil hacks which were missed in V3 (thanks Eric)
- Don't move the declaration of texImg; only required pre-V3.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[V2] Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/main/fbobject.c
, to deallocate the texture
- dont forget to call _mesa_update_fbo_texture
V4: - fix indentation
- don't throw errors on proxy texture targets
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/teximage.c | 167 +--
1 file changed, 163
-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965/brw_tex_layout.c | 1 +
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 ++
src/mesa/drivers/dri/intel/intel_fbo.c | 24 +---
src/mesa/drivers
- set GEN7_SURFACE_ARYSPC_LOD0 if it's set in the miptree.
V2: - Clarify commit message
- Rebased onto Paul's physical/logical dims cleanup
- Added Gen7 support
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri
be
accessed. Software must ensure that the surface is defined
to avoid GTT errors.
To allow the shader to treat all surfaces uniformly, force UMS if the
surface is to be used as a multisample texture, even if CMS would have
been possible.
V3: - Quoted erratum text
Signed-off-by: Chris Forbes
clobbered,
producing bad results.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
---
src/mesa/drivers/dri/i965/brw_defines.h | 1 +
src/mesa/drivers/dri/i965/brw_fs.cpp| 2 ++
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 7 +++
src
: Reworked completely, added support for Gen7.
V3: - Use new sample_index, sample_index_type rather than reusing lod
- Clarify commit message.
V4: - Fix comment style
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/drivers/dri/i965
V2: Works on Ivy Bridge now too, so this can be 6+.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Paul Berry stereotype...@gmail.com
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/drivers/dri/intel/intel_extensions.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mesa
The minmax regression is addressed by my followup series, which adds
the internalformat_query interactions.
Do I need to fold that into this one?
On Sat, Mar 2, 2013 at 7:59 AM, Paul Berry stereotype...@gmail.com wrote:
On 26 February 2013 02:10, Chris Forbes chr...@ijw.co.nz wrote
I've had a quick look at the push-pop-texture-state regression, and
that looks like a real bug I've introduced. I'm looking into it.
On Sat, Mar 2, 2013 at 8:44 AM, Chris Forbes chr...@ijw.co.nz wrote:
The minmax regression is addressed by my followup series, which adds
the internalformat_query
I missed a case in attrib.c; this small patch should be folded in with
the rest of the changes which add support for the new targets:
commit 8b16367bab07cfe2eb44cc96a22bb925593b1e20
Author: Chris Forbes chr...@ijw.co.nz
Date: Sat Mar 2 09:10:25 2013 +1300
fixup glPopAttrib(GL_TEXTURE_BIT
This series adds support for ARB_texture_storage_multisample, which
adds two interesting bits of behavior for multisample textures:
- Immutable-format support, consistent with ARB_texture_storage
- [Get]TexParameter* support
This is admittedly not very useful by itself, but becomes more
this behavior to
TexImage*Multisample, but it seems like the reasonable thing to do.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/teximage.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index
Adds XML for the extension, dispatch_sanity enabling, and the two new
entrypoints. These are both implemented by calling the shared
teximagemultisample() with immutable=GL_TRUE.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
.../glapi/gen/ARB_texture_storage_multisample.xml | 31
---
src/mesa/main/extensions.c | 1 +
src/mesa/main/mtypes.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index e90a296..004fc8e 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -148,6 +148,7 @@ static
Now that there are 4 variants, just pass the function name into
teximagemultisample rather than reconstructing it.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/teximage.c | 30 ++
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/src
- any state which appears in the `per-sampler` state table may not
be set; generates INVALID_OPERATION
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/texparam.c | 92 +++-
1 file changed, 91 insertions(+), 1 deletion(-)
diff --git a/src
This can be enabled everywhere that ARB_texture_multisample is
supported -- ARB_texture_storage is supported on everything.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/intel/intel_extensions.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mesa/drivers/dri
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
docs/GL3.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/GL3.txt b/docs/GL3.txt
index de51693..3c97c8d 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -151,7 +151,7 @@ ARB_shader_storage_buffer_object
For the series: Reviewed-by: Chris Forbes chr...@ijw.co.nz
On Tue, Mar 19, 2013 at 2:57 PM, Kenneth Graunke kenn...@whitecape.org wrote:
This series improves our basic GLSL 1.50 support. First, it makes 1.50
shaders using built-in functions work. Secondly, it adds the new types
and built-ins
This series tidies up the missing interactions between unextended GL3,
ARB_texture_multisample and ARB_internalformat_query.
No serious functional changes from V1, just a lot of shuffling things around.
-- Chris
___
mesa-dev mailing list
, but the driver
may still be able to implement a reasonable resolve operation, so it can
be supported for renderbuffers.
V2: - Don't break Gallium compile.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri/i965/brw_context.c | 6 --
src/mesa/main/dd.h
-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/fbobject.c| 13 ---
src/mesa/main/multisample.c | 54 +
src/mesa/main/multisample.h | 5 +
3 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/fbobject.c b/src
.
- Do this in multisample.c instead.
- Fix typo in error message.
- Inline spec quotes
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Brian Paul bri...@vmware.com
---
src/mesa/main/multisample.c | 29 ++---
src/mesa/main/teximage.c| 34
in the
nonmultisampling case at all.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/fbobject.c | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 3fdf626..c1f5299 100644
--- a/src/mesa/main/fbobject.c
We claim to support ARB_internalformat_query on everything, but only
i965+ bothered to provide the hook -- so QueryInternalformativ() would
just explode (fail the assert in debug; segfault otherwise) on earlier
platforms.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/dri
: - Move from intel to core mesa.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/drivers/common/driverfuncs.c | 3 ++-
src/mesa/main/formatquery.c | 15 +++
src/mesa/main/formatquery.h | 4
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git
This series adds support for the ARB_texture_storage_multisample extension.
Only minor changes from V1:
* Added missing error cases in TexStorage*Multisample. Thanks Eric for
pointing out that this was a bit lacking.
* Dropped spurious special case for TEXTURE_MAX_LEVELS. This wasn't in
the
This is about to be used in teximagemultisample() when immutable=true.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
---
src/mesa/main/texstorage.c | 37 -
src/mesa/main/texstorage.h | 3 +++
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src
this behavior to
TexImage*Multisample, but it seems like the reasonable thing to do.
V2: - Cover missing error cases (unsized formats; texture object zero)
Signed-off-by: Chris Forbes chr...@ijw.co.nz
[V1] Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/main/teximage.c | 31
Adds XML for the extension, dispatch_sanity enabling, and the two new
entrypoints. These are both implemented by calling the shared
teximagemultisample() with immutable=GL_TRUE.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
.../glapi/gen
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/main/extensions.c | 1 +
src/mesa/main/mtypes.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index e90a296..004fc8e 100644
Now that there are 4 variants, just pass the function name into
teximagemultisample rather than reconstructing it.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/main/teximage.c | 30 ++
1 file changed, 14 insertions
- any state which appears in the `per-sampler` state table may not
be set; generates INVALID_OPERATION
V2: Don't introduce bogus handling of TEXTURE_MAX_LEVEL
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/main/texparam.c | 88
This can be enabled everywhere that ARB_texture_multisample is
supported -- ARB_texture_storage is supported on everything.
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
src/mesa/drivers/dri/intel/intel_extensions.c | 1 +
1 file changed, 1 insertion
Signed-off-by: Chris Forbes chr...@ijw.co.nz
Reviewed-by: Eric Anholt e...@anholt.net
---
docs/GL3.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/GL3.txt b/docs/GL3.txt
index 640dec2..898d921 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -151,7 +151,7
sure I won't be really efficient for it at this time. But
certainly for other features in the coming weeks/months.
Le 24/03/2013 22:29, Chris Forbes a écrit :
Hi
OK, thanks. Just thought I'd ask :)
-- Chris
On Mon, Mar 25, 2013 at 10:23 AM, Maxence Le Doré
maxence.led...@gmail.com wrote
A slightly modified version of this (drop the target parameter) should
be a candidate for the 9.1 branch.
On Fri, Mar 29, 2013 at 5:23 PM, Kenneth Graunke kenn...@whitecape.org wrote:
On 03/28/2013 08:28 PM, Chris Forbes wrote:
Previously at least i915 failed to provide an implementation
1 - 100 of 1292 matches
Mail list logo
