mesa.git
12 years agointel: Fix a case when mapping large texture fails
Anuj Phogat [Mon, 27 Feb 2012 19:09:29 +0000 (11:09 -0800)]
intel: Fix a case when mapping large texture fails

This patch handles a case when mapping a large texture fails
in drm_intel_gem_bo_map_gtt(). These changes avoid assertion
failure later in the driver as reported in following bugs:

https://bugs.freedesktop.org/show_bug.cgi?id=44970
https://bugs.freedesktop.org/show_bug.cgi?id=46303

Testing: No regressions in piglit quick.tests

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
12 years agoAdd Makefile to shared-glapi .gitignore
Kenneth Graunke [Tue, 20 Mar 2012 18:50:02 +0000 (11:50 -0700)]
Add Makefile to shared-glapi .gitignore

12 years agoAdd Makefile.in to toplevel .gitignore
Kenneth Graunke [Tue, 20 Mar 2012 18:44:48 +0000 (11:44 -0700)]
Add Makefile.in to toplevel .gitignore

To avoid redundancies, this patch also removes Makefile.in from the
other .gitignore files.

Acked-by: Eric Anholt <eric@anholt.net>
12 years agoAdd .deps/, .libs/, and *.la to toplevel .gitignore
Paul Berry [Thu, 15 Mar 2012 23:43:53 +0000 (16:43 -0700)]
Add .deps/, .libs/, and *.la to toplevel .gitignore

To avoid redundancies, this patch also removes .deps, .libs, and *.la
from .gitignore files in subdirectories.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: only test cube face widths in _mesa_test_texobj_completeness()
Brian Paul [Tue, 20 Mar 2012 13:46:47 +0000 (07:46 -0600)]
mesa: only test cube face widths in _mesa_test_texobj_completeness()

As Eric pointed out, we know the cube faces are square at this point
so we only need to test the texture widths for consistency.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agosoftpipe: set max cube texture size to 4Kx4K
Brian Paul [Sun, 18 Mar 2012 16:45:11 +0000 (10:45 -0600)]
softpipe: set max cube texture size to 4Kx4K

The max size was 16Kx16K so a 4 byte/pixel, six-sided cube would require
6 GBytes of memory.  If mipmapped, 8 GB.  Reduce the max size to 4K to
make the total size more reasonable.

Fixes a crash with the new piglit max-texture-size test.

Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
12 years agomesa: add integer texture completeness check
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: add integer texture completeness check

Per the spec, only nearest filtering is supported for integer textures.
Otherwise, the texture is incomplete.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: rework texture completeness testing
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: rework texture completeness testing

Instead of gl_texture_object::_Complete there are now two fields:
_BaseComplete and _MipmapComplete.  The former indicates whether the base
texture level is valid.  The later indicates whether the whole mipmap is
valid.

With sampler objects, a single texture can appear to be both complete and
incomplete at the same time.  See the GL_ARB_sampler_objects spec for more
details.  To implement this we now check if the texture is complete with
respect to a sampler state.

Another benefit of this is we no longer need to invalidate a texture's
completeness state when we change the minification/magnification filters
with glTexParameter().

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: add _mesa_is_mipmap_filter() helper
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: add _mesa_is_mipmap_filter() helper

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: use _mesa_dirty_texobj() in glTexParameter code
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: use _mesa_dirty_texobj() in glTexParameter code

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: use _mesa_dirty_texobj() function
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: use _mesa_dirty_texobj() function

To mark the texture object as incomplete.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: rewrite/consolidate code in _mesa_test_texobj_completeness()
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: rewrite/consolidate code in _mesa_test_texobj_completeness()

Merge the mipmap level checking code that was separate cases for 1D,
2D, 3D and CUBE before.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: use new baseImage var to simplify _mesa_test_texobj_completeness()
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: use new baseImage var to simplify _mesa_test_texobj_completeness()

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: add comments in _mesa_test_texobj_completeness() related to the spec
Brian Paul [Sat, 17 Mar 2012 22:30:02 +0000 (16:30 -0600)]
mesa: add comments in _mesa_test_texobj_completeness() related to the spec

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: better debug message in _mesa_test_texobj_completeness()
Brian Paul [Sat, 17 Mar 2012 22:30:02 +0000 (16:30 -0600)]
mesa: better debug message in _mesa_test_texobj_completeness()

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: move some code in _mesa_test_texobj_completeness()
Brian Paul [Sat, 17 Mar 2012 22:30:02 +0000 (16:30 -0600)]
mesa: move some code in _mesa_test_texobj_completeness()

Move the simple MaxLevel < BaseLevel test earlier to be closer to where
we error-check BaseLevel.  Also, use the local baseLevel var in more places.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: use switch(target) in _mesa_test_texobj_completeness()
Brian Paul [Sat, 17 Mar 2012 22:30:02 +0000 (16:30 -0600)]
mesa: use switch(target) in _mesa_test_texobj_completeness()

and add missing case for GL_TEXTURE_BUFFER.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: use MAX3() macro for 3D texture in _mesa_test_texobj_completeness()
Brian Paul [Sat, 17 Mar 2012 22:30:02 +0000 (16:30 -0600)]
mesa: use MAX3() macro for 3D texture in _mesa_test_texobj_completeness()

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: make _mesa_reference_sampler_object() an inline function
Brian Paul [Sat, 17 Mar 2012 22:30:03 +0000 (16:30 -0600)]
mesa: make _mesa_reference_sampler_object() an inline function

To make the no-change case faster, as we do for the other object-reference
functions.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoglsl: Don't include the deprecated structure types in GLSL 1.40.
Eric Anholt [Thu, 15 Mar 2012 16:29:47 +0000 (09:29 -0700)]
glsl: Don't include the deprecated structure types in GLSL 1.40.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: Validate the drawing primitive against the transform feedback mode.
Eric Anholt [Wed, 14 Mar 2012 21:44:22 +0000 (14:44 -0700)]
mesa: Validate the drawing primitive against the transform feedback mode.

Fixes piglit GL_EXT_transform_feedback/negative-prims.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Fold error generation into _mesa_valid_prim_mode().
Eric Anholt [Wed, 14 Mar 2012 21:39:15 +0000 (14:39 -0700)]
mesa: Fold error generation into _mesa_valid_prim_mode().

We want to start emitting an INVALID_OPERATION from here for transform
feedback.  Note that this forced dlist.c to almost not use this
function, since it wants different behavior during dlist compile.
Just pull the non-TF, non-GS test out for compile, because:

1) TF doesn't matter in that case because there's no drawing.
2) I don't think we're going to see GSes and display lists in the same
   context, if we don't do GL_ARB_compatibility.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agoshared-glapi: Convert to automake
Kristian Høgsberg [Fri, 16 Mar 2012 16:55:40 +0000 (12:55 -0400)]
shared-glapi: Convert to automake

This fixes a build problem where EGL links to libgbm.la, which encodes
a relative path to it's libglapi.so dependency.  The relative path
breaks when the linker tries to resolve it from src/egl/main instead
of src/gbm.  Typically we silently fall back to the system
libglapi.so, which is wrong and breaks when there isn't one.

Morale of the story: don't mix mklib and libtool.

12 years agor600g: fix r600_get_backend_mask() for virtual addresses
Alex Deucher [Mon, 19 Mar 2012 14:52:46 +0000 (10:52 -0400)]
r600g: fix r600_get_backend_mask() for virtual addresses

I don't think we should hit this path for virtual addresses,
but just in case.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
12 years agoi915: fallback for NPOT cubemap texture
Yuanhan Liu [Wed, 29 Feb 2012 07:04:45 +0000 (15:04 +0800)]
i915: fallback for NPOT cubemap texture

Although some hardware support NPOT cubemap, but it seems we don't know
the right layout for NPOT cubemap. Thus seems we need do fallback for
other platforms as well.

See comments inline the code for more detailed info.

v2: give a more detailed info about why we need fallback for other
    platfroms as well.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46666

NOTE: This is a candidate for stable release branches.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
12 years agor600g: fix point rendering
Marek Olšák [Mon, 19 Mar 2012 01:59:43 +0000 (02:59 +0100)]
r600g: fix point rendering

Accidentally broken in c7eaf274a9b7e3e5f4b060be2320.

12 years agost/mesa: add null pointer check in st_texture_image_map()
Brian Paul [Fri, 16 Mar 2012 15:31:13 +0000 (09:31 -0600)]
st/mesa: add null pointer check in st_texture_image_map()

If we failed to allocate a memory resource for the texture we'd crash
when we tried to map it.  Now we propogate the NULL back up to the
texstore code and generate GL_OUT_OF_MEMORY.

Fixes a crash with the upcoming piglit max-texture-size test.

NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agodocs: add info for installing dependencies on fedora
Alex Hultman [Fri, 16 Mar 2012 15:46:42 +0000 (09:46 -0600)]
docs: add info for installing dependencies on fedora

Signed-off-by: Brian Paul <brianp@vmware.com>
12 years agodri_util: add copyright/license blurb
Brian Paul [Fri, 16 Mar 2012 15:39:01 +0000 (09:39 -0600)]
dri_util: add copyright/license blurb

12 years agodarwin: Link against libxcb
Jeremy Huddleston [Sat, 17 Mar 2012 00:07:06 +0000 (17:07 -0700)]
darwin: Link against libxcb

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
12 years agodarwin: Build create_context.c
Jeremy Huddleston [Sat, 17 Mar 2012 00:03:54 +0000 (17:03 -0700)]
darwin: Build create_context.c

Fixes a build regression from: 588042a8ec4ea91a952c07a0768516fd590758f4

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
12 years agodarwin: config file cleanups
Jeremy Huddleston [Sat, 17 Mar 2012 00:01:01 +0000 (17:01 -0700)]
darwin: config file cleanups

Set our default compiler based on what our installed XCode prefers

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
12 years agoi965/fs: Jump from discard statements to the end of the program when done.
Eric Anholt [Mon, 19 Dec 2011 18:53:10 +0000 (10:53 -0800)]
i965/fs: Jump from discard statements to the end of the program when done.

From the GLSL 1.30 spec:

     The discard keyword is only allowed within fragment shaders. It
     can be used within a fragment shader to abandon the operation on
     the current fragment. This keyword causes the fragment to be
     discarded and no updates to any buffers will occur. Control flow
     exits the shader, and subsequent implicit or explicit derivatives
     are undefined when this control flow is non-uniform (meaning
     different fragments within the primitive take different control
     paths).

v2: Don't emit the final HALT if no other HALTs were emitted.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
12 years agoi965: Add disasm for gen6+ UIP/JIP on BREAK/CONT/HALT.
Eric Anholt [Mon, 12 Mar 2012 19:21:20 +0000 (12:21 -0700)]
i965: Add disasm for gen6+ UIP/JIP on BREAK/CONT/HALT.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Add GLSL 1.40 textureSize() implementations for sampler2DRect.
Eric Anholt [Mon, 12 Mar 2012 21:07:39 +0000 (14:07 -0700)]
glsl: Add GLSL 1.40 textureSize() implementations for sampler2DRect.

By setting lod to 0 in the builtin function implementation, we avoid
needing to update all the visitors to ignore LOD in this case, when
the hardware drivers actually want to ask for LOD 0 for rectangular
textures.

Fixes piglit spec/GLSL-1.40/textureSize-*Rect.

v2: Change style of looking for substrings.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Set up generated builtin functions handling for GLSL 1.40.
Eric Anholt [Mon, 12 Mar 2012 23:08:44 +0000 (16:08 -0700)]
glsl: Set up generated builtin functions handling for GLSL 1.40.

Otherwise, when we go to use ir_reader on the generated code, we won't
have the types present.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Add support for integer sampler2DRect variants in GLSL 1.40.
Eric Anholt [Mon, 12 Mar 2012 21:07:01 +0000 (14:07 -0700)]
glsl: Add support for integer sampler2DRect variants in GLSL 1.40.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Drop ftransform() from GLSL 1.40 profile.
Eric Anholt [Mon, 12 Mar 2012 20:43:13 +0000 (13:43 -0700)]
glsl: Drop ftransform() from GLSL 1.40 profile.

This is the one builtin function claimed to be dropped due to the
ARB_compatibility split.

Fixes piglit spec/GLSL-1.40/compiler/ftransform.vert

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Copy GLSL 1.30 builtin profile to GLSL 1.40.
Eric Anholt [Mon, 12 Mar 2012 20:42:29 +0000 (13:42 -0700)]
glsl: Copy GLSL 1.30 builtin profile to GLSL 1.40.

All that's changed is the #version changing to 140.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: When failing to compile some builtins, print the error.
Eric Anholt [Mon, 12 Mar 2012 22:47:06 +0000 (15:47 -0700)]
glsl: When failing to compile some builtins, print the error.

This makes the process slightly more debuggable, though it would be
nice if the build just failed immediately instead.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Let the builtin compiler process GLSL 1.40 shaders.
Eric Anholt [Mon, 12 Mar 2012 22:51:54 +0000 (15:51 -0700)]
glsl: Let the builtin compiler process GLSL 1.40 shaders.

This is required to put the new 1.40 builtins in place, since they
require new types.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Update builtin variables for GLSL 1.40.
Eric Anholt [Fri, 9 Mar 2012 19:38:34 +0000 (11:38 -0800)]
glsl: Update builtin variables for GLSL 1.40.

Mostly this is a matter of removing variables that have been moved to
the compatibility profile.  There's one addition: gl_InstanceID is
present in the core now.

This fixes the new piglit tests for GLSL 1.40 builtin variables.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Hook up the current GLSL 1.30 types and builtins for 1.40.
Eric Anholt [Thu, 8 Mar 2012 21:49:15 +0000 (13:49 -0800)]
glsl: Hook up the current GLSL 1.30 types and builtins for 1.40.

This gets a basic #version 140 shader compiling.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoglsl: Add support for parsing #version 140.
Eric Anholt [Thu, 8 Mar 2012 21:38:31 +0000 (13:38 -0800)]
glsl: Add support for parsing #version 140.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Enable SIMD16 mode for shaders with loops on Gen6+.
Kenneth Graunke [Mon, 9 Jan 2012 04:42:22 +0000 (20:42 -0800)]
i965: Enable SIMD16 mode for shaders with loops on Gen6+.

The hardware supports it; there's no reason not to.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agogallivm: Fix createOProfileJITEventListener namespace with llvm-3.1.
Vinson Lee [Wed, 14 Mar 2012 05:40:52 +0000 (22:40 -0700)]
gallivm: Fix createOProfileJITEventListener namespace with llvm-3.1.

llvm-3.1svn r152620 refactored the OProfile profiling code.
createOProfileJITEventListener was moved from the llvm namespace to the
llvm::JITEventListener namespace.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agonoop: Use non-recursive automake
Tom Stellard [Sun, 4 Mar 2012 01:35:39 +0000 (20:35 -0500)]
noop: Use non-recursive automake

12 years agoidentity: Use non-recursive automake
Tom Stellard [Sun, 4 Mar 2012 01:14:00 +0000 (20:14 -0500)]
identity: Use non-recursive automake

12 years agogalahad: Use non-recursive automake
Tom Stellard [Sun, 4 Mar 2012 01:02:05 +0000 (20:02 -0500)]
galahad: Use non-recursive automake

12 years agogallium/drivers: Use automake to generate makefile
Tom Stellard [Sat, 3 Mar 2012 14:07:48 +0000 (09:07 -0500)]
gallium/drivers: Use automake to generate makefile

12 years agodocs: fix html in banner.html
Christopher Yeleighton [Wed, 14 Mar 2012 14:05:44 +0000 (08:05 -0600)]
docs: fix html in banner.html

https://bugs.freedesktop.org/show_bug.cgi?id=47304

Signed-off-by: Brian Paul <brianp@vmware.com>
12 years agoglsl: Avoid extra if statements for logic and/or with no side effects.
Eric Anholt [Wed, 8 Feb 2012 06:59:24 +0000 (22:59 -0800)]
glsl: Avoid extra if statements for logic and/or with no side effects.

This avoids extra if statements in the common case of just comparing
two expressions that don't involve assignments or function calls,
along with simplifying the handling of constant expressions.  Reduces
i965 instructions generated in unigine tropics and sanctuary,
yofrankie, warsow, gstreamer shaders, and the weston compositor.

shader-db results:
Total instructions: 213052 -> 212752
38/1246 programs affected (3.0%)
14309 -> 14009 instructions in affected programs (2.1% reduction)

12 years agomesa: add back glGetnUniform*v() overflow error reporting
Dylan Noblesmith [Thu, 22 Dec 2011 21:05:38 +0000 (21:05 +0000)]
mesa: add back glGetnUniform*v() overflow error reporting

The error was removed in:

commit 719909698c67c287a393d2380278e7b7495ae018
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Tue Oct 18 16:01:49 2011 -0700

    mesa: Rewrite the way uniforms are tracked and handled

The GL_ARB_robustness spec doesn't say the implementation
should truncate the output, so just return after setting
the required error like it did before the above commit.

Also fixup an old comment and add an assert.

NOTE: This is a candidate for the 8.0 branch.

12 years agomesa: Fix the cause of piglit test fbo-array failure
Anuj Phogat [Mon, 12 Mar 2012 17:39:48 +0000 (10:39 -0700)]
mesa: Fix the cause of piglit test fbo-array failure

Handle the special case of glFramebufferTextureLayer() for which we pass
teximage = 0 internally in framebuffer_texture(). This patch makes failing
piglit test fbo-array, fbo-depth-array to pass.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47126

V4: Removed the duplicated code.
Note: This is a candidate for the stable branches.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: fix _mesa_DebugMessageCallbackARB() to silence warnings
Brian Paul [Mon, 12 Mar 2012 18:44:48 +0000 (12:44 -0600)]
mesa: fix _mesa_DebugMessageCallbackARB() to silence warnings

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agoradeon: remove use of DD_FLATSHADE
Brian Paul [Mon, 12 Mar 2012 18:45:44 +0000 (12:45 -0600)]
radeon: remove use of DD_FLATSHADE

This got missed earlier <sigh>.

12 years agodocs: fix up html tags in autoconf.html
Christopher Yeleighton [Mon, 12 Mar 2012 18:21:24 +0000 (12:21 -0600)]
docs: fix up html tags in autoconf.html

http://bugs.freedesktop.org/show_bug.cgi?id=47241

Signed-off-by: Brian Paul <brianp@vmware.com>
12 years agomesa: add more comments about textarget in framebuffer_texture()
Brian Paul [Mon, 12 Mar 2012 17:03:59 +0000 (11:03 -0600)]
mesa: add more comments about textarget in framebuffer_texture()

12 years agomesa: renumber remaining DD_ constants
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: renumber remaining DD_ constants

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: remove unused DD_TRI_CULL_FRONT_BACK
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: remove unused DD_TRI_CULL_FRONT_BACK

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: remove unused DD_FLATSHADE
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: remove unused DD_FLATSHADE

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: remove unused DD_TRI_TWOSTENCIL
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: remove unused DD_TRI_TWOSTENCIL

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: remove _DD_NEW_x flags
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: remove _DD_NEW_x flags

They're no longer used anywhere.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agotnl: stop using _DD_NEW_x flags
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
tnl: stop using _DD_NEW_x flags

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoswrast: s/_DD_NEW_SEPARATE_SPECULAR/_MESA_NEW_SEPARATE_SPECULAR/
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
swrast: s/_DD_NEW_SEPARATE_SPECULAR/_MESA_NEW_SEPARATE_SPECULAR/

Another step toward removing the _DD_NEW_x flags

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: define _MESA_NEW_SEPARATE_SPECULAR
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: define _MESA_NEW_SEPARATE_SPECULAR

This will replace the soon-to-be-removed _DD_NEW_SEPARATE_SPECULAR flag.
Note: there's a similar composite _MESA_NEW_NEED_EYE_COORDS flag set already.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoi915: remove occurances of _DD_NEW_x flags
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
i915: remove occurances of _DD_NEW_x flags

Just use the corresponding _NEW_x flags intead.  The _DD_NEW_x flags
will be removed in a following patch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: remove ctx->Driver.ClearColor() hook
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: remove ctx->Driver.ClearColor() hook

The driver Clear() function should just grab the clear color out of the
context.

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agomesa/gdi: remove clear_color() function
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa/gdi: remove clear_color() function

Setup the clearing color in the clear() function.

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agoxlib: remove clear_color() function
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
xlib: remove clear_color() function

Just setup the clearing color in clear_buffers().

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agoradeon/r200: remove ClearColor driver functions
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
radeon/r200: remove ClearColor driver functions

The state.color.clear value was never used anywhere.

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agomesa: remove ctx->Driver.ClearDepth(), ClearStencil() driver hooks
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
mesa: remove ctx->Driver.ClearDepth(), ClearStencil() driver hooks

Not used by any drivers.  Drivers can easily access the values
from the Mesa context at glClear() time.

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agoradeon/r200: remove ClearDepth() and ClearStencil() driver hooks
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
radeon/r200: remove ClearDepth() and ClearStencil() driver hooks

The computed stencil.clear and depth.clear values aren't used anywhere.
Those fields have been removed too.

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agoradeon/r200: remove hyperz/fast clear testing code
Brian Paul [Mon, 12 Mar 2012 00:31:32 +0000 (18:31 -0600)]
radeon/r200: remove hyperz/fast clear testing code

The flags which were computed were never actually used.

Reviewed-by: Dave Airlie <airlied@redhat.com>
12 years agodocs: Fix unclosed anchor tag in xlibdriver.html.
Kenneth Graunke [Mon, 12 Mar 2012 06:38:36 +0000 (23:38 -0700)]
docs: Fix unclosed anchor tag in xlibdriver.html.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47205

12 years agoegl/drm: Include errno.h
José Fonseca [Sun, 11 Mar 2012 19:51:00 +0000 (19:51 +0000)]
egl/drm: Include errno.h

Fixes scons build.

12 years agoSet close on exec flag FD_CLOEXEC
David Fries [Sat, 10 Dec 2011 17:28:45 +0000 (11:28 -0600)]
Set close on exec flag FD_CLOEXEC

Set the close on exec flag when opening dri character devices, so they
will be closed and free any resouces allocated in exec.

Signed-off-by: David Fries <David@Fries.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agomapi/glapi: Fix glDebugMessageCallbackARB arg type to GLDEBUGPROCARB
José Fonseca [Sun, 11 Mar 2012 10:47:23 +0000 (10:47 +0000)]
mapi/glapi: Fix glDebugMessageCallbackARB arg type to GLDEBUGPROCARB

Necessary to prevent type mismatches on MinGW.

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agoglapi/gen: Add support for pointer types.
José Fonseca [Sun, 11 Mar 2012 10:47:22 +0000 (10:47 +0000)]
glapi/gen: Add support for pointer types.

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agomesa: Prevent collision of ERROR define on Windows.
José Fonseca [Sun, 11 Mar 2012 10:47:21 +0000 (10:47 +0000)]
mesa: Prevent collision of ERROR define on Windows.

This issue might recur on other OSes. If so then it might be better
to remove the C-preprocessor magic, and use fully qualified defines
instead.

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agoinclude: Fix glDebugMessageCallbackARB's prototype.
José Fonseca [Sun, 11 Mar 2012 10:47:20 +0000 (10:47 +0000)]
include: Fix glDebugMessageCallbackARB's prototype.

Seems to be a bug in Khronos headers, as

http://www.opengl.org/registry/specs/ARB/debug_output.txt states userParam
is not a const pointer.

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agomesa: expose ARB_debug_output
Marek Olšák [Tue, 14 Feb 2012 13:26:23 +0000 (14:26 +0100)]
mesa: expose ARB_debug_output

12 years agomesa: display list dispatch for ARB_debug_output
Marek Olšák [Wed, 15 Feb 2012 00:18:43 +0000 (01:18 +0100)]
mesa: display list dispatch for ARB_debug_output

12 years agomesa: print GL errors via debug_output
Marek Olšák [Tue, 14 Feb 2012 22:27:17 +0000 (23:27 +0100)]
mesa: print GL errors via debug_output

12 years agomesa: implement the last of GL_ARB_debug_output
nobled [Wed, 4 May 2011 19:42:55 +0000 (19:42 +0000)]
mesa: implement the last of GL_ARB_debug_output

Store client-defined message IDs in a hash table,
and sort them by severity into three linked lists
so they can be selected by severity level later.

12 years agomesa: add struct for managing client debug namespaces
nobled [Wed, 4 May 2011 14:40:35 +0000 (14:40 +0000)]
mesa: add struct for managing client debug namespaces

The final piece of the puzzle for GL_ARB_debug_output.

12 years agomesa: add control for categories of application-provided messages
nobled [Mon, 2 May 2011 20:31:00 +0000 (20:31 +0000)]
mesa: add control for categories of application-provided messages

This state is needed for deciding whether or not to log
application messages with IDs that haven't been specifically
passed to glDebugMessageControlARB yet.

State for each individual ID number ever passed to
glDebugMessageControlARB (per-context) still needs to be added.

12 years agomesa: add yet more context fields for GL_ARB_debug_output
nobled [Mon, 2 May 2011 17:52:28 +0000 (17:52 +0000)]
mesa: add yet more context fields for GL_ARB_debug_output

12 years agomesa: add glDebugMessageControlARB
nobled [Mon, 2 May 2011 17:48:05 +0000 (17:48 +0000)]
mesa: add glDebugMessageControlARB

Controlling the output of client-provided messages
isn't done yet.

12 years agomesa: add message-toggle booleans for GL_ARB_debug_output
nobled [Mon, 2 May 2011 17:43:38 +0000 (17:43 +0000)]
mesa: add message-toggle booleans for GL_ARB_debug_output

12 years agomesa: add some GL_ARB_debug_output functions
nobled [Mon, 2 May 2011 17:20:55 +0000 (17:20 +0000)]
mesa: add some GL_ARB_debug_output functions

12 years agomesa: add infrastructure for GL_ARB_debug_output
nobled [Sun, 1 May 2011 15:46:45 +0000 (15:46 +0000)]
mesa: add infrastructure for GL_ARB_debug_output

Marek v2: don't add the extension to extensions.c yet

12 years agoglapi: regenerate files
Marek Olšák [Sat, 10 Sep 2011 09:33:28 +0000 (11:33 +0200)]
glapi: regenerate files

12 years agoglapi: add ARB_debug_output.xml
nobled [Sun, 1 May 2011 15:46:12 +0000 (15:46 +0000)]
glapi: add ARB_debug_output.xml

Marek v2: replace GLDEBUGPROCARB with void*

12 years agomesa: split error handling into its own file
nobled [Sun, 1 May 2011 12:47:31 +0000 (12:47 +0000)]
mesa: split error handling into its own file

Also add _mesa_vsnprintf.

12 years agodrirc: Add force_glsl_extensions_warn workaround for Unigine Heaven.
Kenneth Graunke [Thu, 8 Mar 2012 19:06:42 +0000 (11:06 -0800)]
drirc: Add force_glsl_extensions_warn workaround for Unigine Heaven.

Unfortunately, Unigine Heaven 3.0 still needs this.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agosvga: Disable bogus assertions concerning min_index/max_index.
José Fonseca [Fri, 2 Mar 2012 12:44:00 +0000 (12:44 +0000)]
svga: Disable bogus assertions concerning min_index/max_index.

min_index/max_index are merely conservative guesses, so we can't
make buffer overflow detection based on their values.

Tested-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agomesa: fix GL_LUMINANCE handling in glGetTexImage
Brian Paul [Fri, 9 Mar 2012 03:16:00 +0000 (20:16 -0700)]
mesa: fix GL_LUMINANCE handling in glGetTexImage

There are several cases in which we need to explicity "rebase" colors
(ex: set G=B=0) when getting GL_LUMINANCE textures:
1. If the luminance texture is actually stored as rgba
2. If getting a luminance texture, but returning rgba
3. If getting an rgba texture, but returning luminance

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=46679

Also fixes the new piglit getteximage-luminance test.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agosvga: add null vs pointer check in update_need_pipeline()
Brian Paul [Fri, 9 Mar 2012 15:16:26 +0000 (08:16 -0700)]
svga: add null vs pointer check in update_need_pipeline()

Based on a patch submitted by Vic Lee.  The other part of his patch
which checked the fs pointer wasn't needed.

This fixes a crash when clear() is called before any VS or FS is set.
But this can only happen when the driver is used without the Mesa
state tracker.

NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agonv50: add support for R8G8_R8B8 and G8R8_B8R8 formats
Christoph Bumiller [Fri, 9 Mar 2012 14:17:36 +0000 (15:17 +0100)]
nv50: add support for R8G8_R8B8 and G8R8_B8R8 formats