mesa.git
12 years agoi965: Share the draw x/y offset masking code between main/blorp and all gens.
Eric Anholt [Tue, 7 Aug 2012 23:53:24 +0000 (16:53 -0700)]
i965: Share the draw x/y offset masking code between main/blorp and all gens.

This code is twisty, and the comment before most of the blocks was actually
giving me the opposite impression from its intention: We want to apply as much
of our offset as possible through coarse tile-aligned adjustment, since we can
do so independently per buffer, and apply the minimum we can through
fine-grained drawing offset x/y, since it has to agree between all buffers.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Make a helper function for the renderbuffer temporary mt workaround.
Eric Anholt [Wed, 8 Aug 2012 16:29:46 +0000 (09:29 -0700)]
i965: Make a helper function for the renderbuffer temporary mt workaround.

We now have a case of wanting to do that on gen6+ as well, so make this logic
usable elsewhere.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Warn on a couple of workarounds in blending.
Eric Anholt [Fri, 12 Oct 2012 19:53:08 +0000 (12:53 -0700)]
i965: Warn on a couple of workarounds in blending.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agointel: Add a macro for printing a debug warning once.
Eric Anholt [Fri, 12 Oct 2012 19:41:56 +0000 (12:41 -0700)]
intel: Add a macro for printing a debug warning once.

There are a number of places where some obscure piece of the code is not
currently worth fixing, and we have some workaround behavior available.  It's
nicer for users to do some lame workaround than to just assert, but without
asserts we never knew when the workaround was at fault.

This should give us a nice compromise: Execute the workaround, but mention
that the obscure workaround was hit.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agodocs: add note about removal of GL_NV_fragment_program
Andreas Boll [Tue, 16 Oct 2012 19:24:04 +0000 (21:24 +0200)]
docs: add note about removal of GL_NV_fragment_program

12 years agoglapi: Delete gles_api.py, since it is no longer used.
Paul Berry [Wed, 10 Oct 2012 23:59:20 +0000 (16:59 -0700)]
glapi: Delete gles_api.py, since it is no longer used.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomapi_abi: Use GLES information from XML rather than gles_api.py.
Paul Berry [Wed, 10 Oct 2012 23:31:01 +0000 (16:31 -0700)]
mapi_abi: Use GLES information from XML rather than gles_api.py.

Note: mapi_abi can consume API information from either XML or a .csv
file.  A side effect of this change is that the ES1 and ES2 API
printers can only be used with XML input now.  That's ok, since the
.csv input format is only used for the OpenVG API.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomapi_abi: Override 'hidden' and 'handcode' attributes using polymorphism.
Paul Berry [Wed, 10 Oct 2012 22:19:21 +0000 (15:19 -0700)]
mapi_abi: Override 'hidden' and 'handcode' attributes using polymorphism.

Previously, the ES1, ES2, and shared GLAPI printers passed a list of
function names to the base class constructor, which was used by the
_override_for_api() function to loop over all the API functions and
adjust their 'hidden' and 'handcode' attributes as appropriate for the
API flavour being code-generated.

This patch lifts the loop from _override_for_api() into its caller,
and makes it into a polymorphic function, so that the derived classes
can customize its behaviour directly.  In a future patch, this will
allow us to override the 'hidden' and 'handcode' attributes based on
information from the XML rather than a list of functions.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomapi_abi: Get rid of unnecessary copy.
Paul Berry [Wed, 10 Oct 2012 22:10:00 +0000 (15:10 -0700)]
mapi_abi: Get rid of unnecessary copy.

Previously, _get_api_entries() would make a deep copy of each element
in the entries table before modifying the 'hidden' and 'handcode'
attributes.  This was unnecessary, since the entries aren't used again
after this function.  Removing the copy simplifies the code, because
it is no longer necessary to adjust the alias pointers to point to the
copied entries.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomapi_abi: Remove sanity check that all GLES functions are present.
Paul Berry [Wed, 10 Oct 2012 22:07:00 +0000 (15:07 -0700)]
mapi_abi: Remove sanity check that all GLES functions are present.

Currently mapi_abi.py uses hardcoded lists of function names (in
gles_api.py) to determine which functions need to be included in the
GLES 1 or GLES 2 API.  This patch removes a sanity check which
verified that all GLES functions listed in the hardcoded lists were
actually present in the XML.

Later patches in this series will modify mapi_abi.py to determine
which functions need to be included in the GLES 1 or GLES 2 API based
directly on the XML.  Once that is done, the sanity check will be
redundant.  Removing the sanity check now will simplify the patches to
come.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agomapi_abi: Collect all imports at top of file.
Paul Berry [Wed, 10 Oct 2012 21:52:48 +0000 (14:52 -0700)]
mapi_abi: Collect all imports at top of file.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoglapi: Use GLES information from XML rather than gles_api.py.
Paul Berry [Wed, 10 Oct 2012 23:48:08 +0000 (16:48 -0700)]
glapi: Use GLES information from XML rather than gles_api.py.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoglapi: Read GLES information from XML.
Paul Berry [Wed, 10 Oct 2012 23:48:08 +0000 (16:48 -0700)]
glapi: Read GLES information from XML.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoglapi: Add es1 and es2 attributes to XML.
Paul Berry [Wed, 10 Oct 2012 23:28:42 +0000 (16:28 -0700)]
glapi: Add es1 and es2 attributes to XML.

Currently, the set of functions which exist in GLES1 or GLES2 is
determined by hardcoded lists of function names in gles_api.py.  This
patch encodes that information into the XML files using new
attributes, es1 and es2.

The es1 attribute denotes the first version of GLES 1 in which the
function exists (e.g. es1="1.1" means the function exists in GLES 1.1
but not GLES 1.0).  "none" (the default) means the function is not
available in any version of GLES 1.

The es2 attribute denotes the first version of GLES 2/3 in which the
function exists (e.g. es2="2.0" means the function exists in both GLES
2.0 and GLES 3.0).  "none" (the default) means the function is not
available in any version of GLES 2 or GLES 3.

Note that since GLES 3 is a strict superset of GLES 2, there is no
need for a separate attribute for it; instead, 'es2="3.0"' should be
used to denote functions that are present in GLES 3 but not GLES 2.

This patch only adds information about GLES versions 1.0, 1.1, and
2.0.

Later patches will modify the python code generation scripts to use
this information rather than the hardcoded lists in gles_api.py.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoglapi: use new-style Python classes.
Paul Berry [Wed, 10 Oct 2012 18:01:35 +0000 (11:01 -0700)]
glapi: use new-style Python classes.

An unfortunate quirk of Python 2 is that there are two types of
classes: "classic" classes (which are backward compatible with some
unfortunate design decisions made early in Python's history), and
"new-style" classes.  Classic classes have a number of limitations
(for example they don't support super()) and are unavailable in Python
3.  There's really no reason to use classic classes, except in
unmaintained legacy code.  For more information see
http://www.python.org/download/releases/2.2.3/descrintro/.

This patch upgrades the Python code in src/mapi/glapi/gen to use
exclusively new-style classes.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoi965/fs: Fix segfault when using INTEL_DEBUG=perf with non-GLSL.
Kenneth Graunke [Mon, 15 Oct 2012 19:00:38 +0000 (12:00 -0700)]
i965/fs: Fix segfault when using INTEL_DEBUG=perf with non-GLSL.

Now that ARB programs and fixed function are routed through the new
backend, shader might be NULL.  Don't do INTEL_DEBUG=perf support in
that case, since it relies on shader->compiled_once.

Since INTEL_DEBUG=perf wasn't previously supported, this maintains the
status quo.  It might be nice to support it someday, however.

This could be moved to brw_shader_program instead of brw_shader, but
it appears even prog can be NULL in that case.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: Don't flatten IF statements by default.
Kenneth Graunke [Thu, 20 Sep 2012 21:27:29 +0000 (14:27 -0700)]
mesa: Don't flatten IF statements by default.

MaxIfDepth of 0 means "flatten all the time", not "never flatten".
This is only desirable on hardware that can't support control flow;
software rasterization and most hardware drivers want this.

This alters behavior for swrast as well as i915.  Tested on i915.

NOTE: This is a candidate for stable release branches.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: Remove PROGRAM_WRITE_ONLY register type.
Kenneth Graunke [Mon, 15 Oct 2012 00:04:01 +0000 (17:04 -0700)]
mesa: Remove PROGRAM_WRITE_ONLY register type.

More dead code.  I'm not sure what it was for.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove dead _mesa_num_parameters_of_type() function.
Kenneth Graunke [Thu, 11 Oct 2012 00:07:53 +0000 (17:07 -0700)]
mesa: Remove dead _mesa_num_parameters_of_type() function.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove dead _mesa_add_attribute() function.
Kenneth Graunke [Thu, 11 Oct 2012 00:06:41 +0000 (17:06 -0700)]
mesa: Remove dead _mesa_add_attribute() function.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove remnants of PROGRAM_VARYING.
Kenneth Graunke [Sun, 14 Oct 2012 23:56:42 +0000 (16:56 -0700)]
mesa: Remove remnants of PROGRAM_VARYING.

The previous patch removed the producer of things in this file.
Since there aren't any, we can remove it.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove dead _mesa_add_varying() function.
Kenneth Graunke [Thu, 11 Oct 2012 00:04:33 +0000 (17:04 -0700)]
mesa: Remove dead _mesa_add_varying() function.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove dead program_parameter::Flags field.
Kenneth Graunke [Thu, 11 Oct 2012 00:02:45 +0000 (17:02 -0700)]
mesa: Remove dead program_parameter::Flags field.

All flags are now gone, so we can stop storing and passing this around.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agost/mesa: Remove the PROG_PARAM_BIT_CYL_WRAP flag. [v2]
Kenneth Graunke [Mon, 15 Oct 2012 18:10:47 +0000 (11:10 -0700)]
st/mesa: Remove the PROG_PARAM_BIT_CYL_WRAP flag. [v2]

Nobody ever set the flag, which makes this dead code.

v2: Leave the ureg_DECL_fs_input_cyl function in place, even though it's
    unused, since VMWare uses it for their internal projects.

Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove GLSL-related PROG_PARAM_BIT flags.
Kenneth Graunke [Wed, 10 Oct 2012 23:52:23 +0000 (16:52 -0700)]
mesa: Remove GLSL-related PROG_PARAM_BIT flags.

GLSL doesn't use the program code anymore.  Accordingly, there were no
consumers of these flags, so there's no need to define them.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove support for named parameters.
Kenneth Graunke [Sun, 14 Oct 2012 23:43:15 +0000 (16:43 -0700)]
mesa: Remove support for named parameters.

These were only part of NV_fragment_program, so we can kill them.

The fact that PROGRAM_NAMED_PARAM appears in r200_vertprog.c is rather
comedic, but also demonstrates that people just spam the various types
of parameters everywhere because they're confusing.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agodriconf: Remove force enable for NV_vertex_program.
Kenneth Graunke [Sun, 14 Oct 2012 23:36:21 +0000 (16:36 -0700)]
driconf: Remove force enable for NV_vertex_program.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove yet more remnants of NV_fragment_program.
Kenneth Graunke [Sun, 14 Oct 2012 23:27:51 +0000 (16:27 -0700)]
mesa: Remove yet more remnants of NV_fragment_program.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove some miscellaneous NV program stuff from arbprogram.c.
Kenneth Graunke [Sun, 14 Oct 2012 23:12:47 +0000 (16:12 -0700)]
mesa: Remove some miscellaneous NV program stuff from arbprogram.c.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Simplify _mesa_BindProgram() by removing NV program remnants.
Kenneth Graunke [Sun, 14 Oct 2012 22:58:17 +0000 (15:58 -0700)]
mesa: Simplify _mesa_BindProgram() by removing NV program remnants.

Without NV programs, there's no need for the compatible_program_targets
function.  A simple (non-)equality check will do.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove get and enable bits for NV_fragment_program.
Kenneth Graunke [Sun, 14 Oct 2012 22:53:06 +0000 (15:53 -0700)]
mesa: Remove get and enable bits for NV_fragment_program.

Also remove a leftover remnant from NV_vertex_program.

v2: Update for Imre's get changes.

Reviewed-by: Brian Paul <brianp@vmware.com> [v1]
Reviewed-by: Eric Anholt <eric@anholt.net> [v1]
12 years agomesa: Remove prog_print support for NV programs.
Kenneth Graunke [Sun, 14 Oct 2012 22:39:04 +0000 (15:39 -0700)]
mesa: Remove prog_print support for NV programs.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove support for parsing NV fragment programs.
Kenneth Graunke [Sun, 14 Oct 2012 22:36:07 +0000 (15:36 -0700)]
mesa: Remove support for parsing NV fragment programs.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove the gl_program::Resident flag.
Kenneth Graunke [Sun, 14 Oct 2012 22:30:40 +0000 (15:30 -0700)]
mesa: Remove the gl_program::Resident flag.

It apparently was only used for NV programs.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove the EmitNVTempInitialization shader compiler option.
Kenneth Graunke [Sun, 14 Oct 2012 22:24:55 +0000 (15:24 -0700)]
mesa: Remove the EmitNVTempInitialization shader compiler option.

Nobody uses it anymore.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove the NV program API functions.
Kenneth Graunke [Sun, 14 Oct 2012 22:02:04 +0000 (15:02 -0700)]
mesa: Remove the NV program API functions.

These are all unused now.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Switch to the other glGetVertexAttribPointervARB implementation.
Kenneth Graunke [Sun, 14 Oct 2012 22:09:19 +0000 (15:09 -0700)]
mesa: Switch to the other glGetVertexAttribPointervARB implementation.

Previously, Mesa used nvprogram.c's _mesa_GetVertexAttribPointervNV()
function to implement this GL call.  There was also a second
implementation in varray.c, _mesa_GetVertexAttribPointervARB(), which
was entirely unused.

The varray.c variant has an additional assertion and checks the index
against ctx->Const.VertexProgram.MaxAttribs rather than
MAX_VERTEX_GENERIC_ATTRIBS.  However, that variable is defined to the
same value, so it should be fine.

This will allow us to kill the duplicate function.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Remove some shared NV_vp/fp functions from the dispatch table.
Kenneth Graunke [Sun, 14 Oct 2012 21:58:27 +0000 (14:58 -0700)]
mesa: Remove some shared NV_vp/fp functions from the dispatch table.

Also kill the resulting dead code for display list handling.

v2: Also kill dlist's OPCODE_REQUEST_RESIDENT_PROGRAMS_NV.

Reviewed-by: Brian Paul <brianp@vmware.com> [v1]
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agomesa: Unhook NV_fragment_program API from the dispatch table.
Kenneth Graunke [Sun, 14 Oct 2012 21:43:43 +0000 (14:43 -0700)]
mesa: Unhook NV_fragment_program API from the dispatch table.

The NamedParameter functions were introduced in NV_fragment_program, and
are not shared with any other extensions.

Although this patch appears to remove the LocalParameter functions, it
does not: the ARB_fragment_program section also set them up.  Now we
simply initialize them a single time.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoswrast: Remove support for the NV_fragment_program extension.
Kenneth Graunke [Thu, 11 Oct 2012 20:42:40 +0000 (13:42 -0700)]
swrast: Remove support for the NV_fragment_program extension.

No hardware drivers support this, it's obsolete, and unlikely to be
useful without NV_vertex_program, which is gone now.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoradeonsi: add some new SI pci ids
Alex Deucher [Tue, 16 Oct 2012 17:11:38 +0000 (13:11 -0400)]
radeonsi: add some new SI pci ids

Note: this is a candidate for the stable branch.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: Fix segfault in r600_compute_global_transfer_map()
Tom Stellard [Tue, 16 Oct 2012 14:21:40 +0000 (14:21 +0000)]
r600g: Fix segfault in r600_compute_global_transfer_map()

This segfault was caused by commit
369e46888904c6d379b8b477d9242cff1608e30e, however it is my fault for not
testing the patch while it was on the list.

12 years agor600g: Fix build with --enable-opencl
Tom Stellard [Tue, 16 Oct 2012 14:38:54 +0000 (14:38 +0000)]
r600g: Fix build with --enable-opencl

12 years agomesa/es: Enable GL_EXT_map_buffer_range
Fredrik Höglund [Wed, 10 Oct 2012 14:27:31 +0000 (16:27 +0200)]
mesa/es: Enable GL_EXT_map_buffer_range

This extension is functionally the same as GL_ARB_map_buffer_range.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agogbm: Reject buffers that are not wl_drm buffers in gbm_bo_import()
Kristian Høgsberg [Mon, 1 Oct 2012 15:19:10 +0000 (11:19 -0400)]
gbm: Reject buffers that are not wl_drm buffers in gbm_bo_import()

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
12 years agoglx: Fix a regression in the new XCB code
Fredrik Höglund [Mon, 15 Oct 2012 19:02:05 +0000 (21:02 +0200)]
glx: Fix a regression in the new XCB code

dri2DrawableGetMSC(), dri2WaitForMSC() and dri2WaitForSBC() were
inadvertently changed to return 0 on success.  This resulted in the callers
returning an error to the client.

Restore the previous behavior and also check that the reply pointers are
valid before accessing them.

Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agost/mesa: remove OPCODE_BRA switch case
Brian Paul [Mon, 15 Oct 2012 19:17:53 +0000 (13:17 -0600)]
st/mesa: remove OPCODE_BRA switch case

12 years agodocs: Add note about removal of GL_NV_vertex_program.
Eric Anholt [Mon, 15 Oct 2012 17:12:25 +0000 (10:12 -0700)]
docs: Add note about removal of GL_NV_vertex_program.

12 years agomesa: Remove defines for NV_vertex_program limits.
Eric Anholt [Wed, 10 Oct 2012 00:52:34 +0000 (17:52 -0700)]
mesa: Remove defines for NV_vertex_program limits.

Note that _mesa_GetVertexAttribPointervNV() is actually
glGetVertexAttribPointerv(), which operates on the generic attributes.  The
geometry shader initialization looks like arbitrary cruft to me.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Fix comments for NV_vp code that's now only used by other extensions.
Eric Anholt [Wed, 10 Oct 2012 00:08:17 +0000 (17:08 -0700)]
mesa: Fix comments for NV_vp code that's now only used by other extensions.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Add notes about remaining NV_vertex_program code.
Eric Anholt [Tue, 9 Oct 2012 23:38:56 +0000 (16:38 -0700)]
mesa: Add notes about remaining NV_vertex_program code.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Remove miscellaneous remains of NV_vertex_program.
Eric Anholt [Tue, 9 Oct 2012 22:33:21 +0000 (15:33 -0700)]
mesa: Remove miscellaneous remains of NV_vertex_program.

v2: Rebase on top of get.c changes.

Reviewed-by: Brian Paul <brianp@vmware.com> (v1)
12 years agomesa: Remove API specific to GL_NV_vertex_program's aliased attribs.
Eric Anholt [Wed, 10 Oct 2012 00:28:55 +0000 (17:28 -0700)]
mesa: Remove API specific to GL_NV_vertex_program's aliased attribs.

v2: Rebase on top of get.c changes.

Reviewed-by: Brian Paul <brianp@vmware.com> (v1)
12 years agomesa: Remove prog_instruction.h field for never-supported NV_vertex_program3.
Eric Anholt [Tue, 9 Oct 2012 23:59:32 +0000 (16:59 -0700)]
mesa: Remove prog_instruction.h field for never-supported NV_vertex_program3.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Remove support for GL_VERTEX_STATE_PROGRAMs and their execution.
Eric Anholt [Tue, 9 Oct 2012 23:44:41 +0000 (16:44 -0700)]
mesa: Remove support for GL_VERTEX_STATE_PROGRAMs and their execution.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Remove NV_vertex_program-specific parameters support.
Eric Anholt [Tue, 9 Oct 2012 23:18:35 +0000 (16:18 -0700)]
mesa: Remove NV_vertex_program-specific parameters support.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Remove support for NV_vertex_program's attribute evaluation.
Eric Anholt [Tue, 9 Oct 2012 22:49:55 +0000 (15:49 -0700)]
mesa: Remove support for NV_vertex_program's attribute evaluation.

Note that the MAP2 getters were missing from the implementation.  Neat.

v2: Rebase on top of get.c changes.

Reviewed-by: Brian Paul <brianp@vmware.com> (v1)
12 years agomesa: Remove support for NV_vertex_program's special attributes aliasing
Eric Anholt [Tue, 9 Oct 2012 22:38:53 +0000 (15:38 -0700)]
mesa: Remove support for NV_vertex_program's special attributes aliasing

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Fix NV_fragment_program's display list opcode for RequestResident.
Eric Anholt [Tue, 9 Oct 2012 23:08:44 +0000 (16:08 -0700)]
mesa: Fix NV_fragment_program's display list opcode for RequestResident.

While nuking NV_vertex_program, I noticed that one of my opcodes was used in a
strange place.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Remove support for NV_vertex_program's tracked matrices.
Eric Anholt [Tue, 9 Oct 2012 22:34:49 +0000 (15:34 -0700)]
mesa: Remove support for NV_vertex_program's tracked matrices.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agomesa: Remove Mesa IR opcodes that existed only for NV_vertex_program.
Eric Anholt [Tue, 9 Oct 2012 22:31:42 +0000 (15:31 -0700)]
mesa: Remove Mesa IR opcodes that existed only for NV_vertex_program.

v2: Remove dead positive() function, caught by Matt.

Reviewed-by: Brian Paul <brianp@vmware.com> (v1)
12 years agomesa: Remove support for parsing NV vertex programs.
Eric Anholt [Tue, 9 Oct 2012 22:16:56 +0000 (15:16 -0700)]
mesa: Remove support for parsing NV vertex programs.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agoswrast: Remove support for GL_NV_vertex_program.
Eric Anholt [Tue, 9 Oct 2012 22:11:57 +0000 (15:11 -0700)]
swrast: Remove support for GL_NV_vertex_program.

It's not supported in any hardware drivers, and doesn't appear to be useful on
Linux.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agogallium: Remove #if 0-ed enable of NV_vp. It's going away.
Eric Anholt [Tue, 9 Oct 2012 22:11:12 +0000 (15:11 -0700)]
gallium: Remove #if 0-ed enable of NV_vp.  It's going away.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agor200: Remove support for software-only NV_vertex_program.
Eric Anholt [Tue, 9 Oct 2012 22:07:25 +0000 (15:07 -0700)]
r200: Remove support for software-only NV_vertex_program.

It wasn't supported in hardware, and the comments in the code indicated no
known uses (similar to my experience on Intel) and a possible intent to remove
it.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agointel: Remove NV_vertex_program support.
Eric Anholt [Tue, 9 Oct 2012 21:56:33 +0000 (14:56 -0700)]
intel: Remove NV_vertex_program support.

We were holding on to this code because we were aware that NWN 1 had some
support for vertex programs -- no other linux programs I've come across would
use it (since other software also has ARB_vp or GLSL support).  Only, it turns
out that NWN doesn't even give us any vertex programs.  Given that we have
known issues where the extension has never been fully supported, just give up
on it.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46795
Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agoi965/vp: Remove more code for unused opcodes.
Eric Anholt [Tue, 9 Oct 2012 22:00:25 +0000 (15:00 -0700)]
i965/vp: Remove more code for unused opcodes.

These don't appear in ARB_vp or NV_vp and I missed that fact on the first
pass of removing dead opcodes.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agor600g: drop useless switch statement
Andreas Boll [Thu, 11 Oct 2012 12:06:31 +0000 (14:06 +0200)]
r600g: drop useless switch statement

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agogallium/docs: update some distro information
Andreas Boll [Sun, 14 Oct 2012 11:30:21 +0000 (13:30 +0200)]
gallium/docs: update some distro information

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agor600g: emit the border color only when it's needed
Marek Olšák [Sun, 14 Oct 2012 02:12:32 +0000 (04:12 +0200)]
r600g: emit the border color only when it's needed

That depends on the texture wrap modes and filtering.

12 years agor600g: cleanup create_sampler_state functions
Marek Olšák [Sun, 14 Oct 2012 01:53:09 +0000 (03:53 +0200)]
r600g: cleanup create_sampler_state functions

- stopped using util_color
- reformatted to occupy less characters per line.
- used memcpy for the border color
- used pipe_color_union in the state structure

12 years agost/mesa: fix integer texture border color for some formats (v2)
Marek Olšák [Mon, 15 Oct 2012 01:55:23 +0000 (03:55 +0200)]
st/mesa: fix integer texture border color for some formats (v2)

And the clear color too, though that may be an issue only with GL_RGB if it's
actually RGBA in the driver.

NOTE: This is a candidate for the stable branches.

Reviewed-by: Brian Paul <brianp@vmware.com>
v2: The types of st_translate_color parameters were changed to gl_color_union
    and pipe_color_union as per Brian's comment.

12 years agoutil: added debug_print_transfer_flags() function
Brian Paul [Fri, 12 Oct 2012 18:10:59 +0000 (12:10 -0600)]
util: added debug_print_transfer_flags() function

12 years agomesa: Fix a crash in update_texture_state() for external texture type
Abdiel Janulgue [Fri, 12 Oct 2012 08:51:03 +0000 (11:51 +0300)]
mesa: Fix a crash in update_texture_state() for external texture type

NOTE: This is a candidate for the stable branch.

Signed-off-by: Abdiel <abdiel.janulgue@intel.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
12 years agosvga: remove needless debug-mode linked list code
Brian Paul [Thu, 11 Oct 2012 22:02:18 +0000 (16:02 -0600)]
svga: remove needless debug-mode linked list code

LIST_DEL() always sets the prev/next pointers to NULL now.

12 years agoutil: null-out the node's prev/next pointers in list_del()
Chris Fester [Thu, 11 Oct 2012 22:01:23 +0000 (16:01 -0600)]
util: null-out the node's prev/next pointers in list_del()

Note: This is a candidate for the 9.0 branch.
Signed-off-by: Brian Paul <brianp@vmware.com>
12 years agobuild: Don't fail if libX11 isn't installed
Daniel Stone [Tue, 9 Oct 2012 03:27:06 +0000 (14:27 +1100)]
build: Don't fail if libX11 isn't installed

configure.ac would previously refuse to complete if libX11 wasn't
installed, even if we'd disabled GLX and weren't building an X11 EGL
platform.  Make the check simply set the no_x variable that's used (but
never set) immediately below for what looks like this very case.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
12 years agonouveau: fix offset in nouveau_buffer_transfer_map
Christoph Bumiller [Sun, 14 Oct 2012 16:58:04 +0000 (18:58 +0200)]
nouveau: fix offset in nouveau_buffer_transfer_map

Before 369e46888904c6d379b8b477d9242cff1608e30e, the transfer was
initialized before the call to map and had the correct value already.

12 years agou_format_s3tc.c: Don't call getenv() twice
Matt Turner [Wed, 10 Oct 2012 22:34:59 +0000 (15:34 -0700)]
u_format_s3tc.c: Don't call getenv() twice

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agoandroid: generate matching remap_helper to dispatch table
Tapani Pälli [Tue, 2 Oct 2012 11:50:31 +0000 (14:50 +0300)]
android: generate matching remap_helper to dispatch table

commit a010215463c63680c69e90202fe3fcd2e5b25fa6 removed ES2 specific dispatch
table and remap_helper, since now we are using dispatch.h which is generated
from gl_and_es_API.xml we need to generate a matching remap_helper using the
same xml.

Note: This is a candidate for the 9.0 branch.
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
12 years agogallivm: Don't use llvm.x86.avx.max/min.ps.256 inadvertently.
José Fonseca [Wed, 10 Oct 2012 18:44:49 +0000 (19:44 +0100)]
gallivm: Don't use llvm.x86.avx.max/min.ps.256 inadvertently.

Could happen when CPU supports AVX, but LLVM doesn't.

12 years agotgsi: Dump register number when dumping immediates.
José Fonseca [Thu, 11 Oct 2012 13:56:26 +0000 (14:56 +0100)]
tgsi: Dump register number when dumping immediates.

For example:

VERT
DCL IN[0]
DCL OUT[0], POSITION
DCL OUT[1], GENERIC[12]
DCL CONST[0..4]
DCL TEMP[0], LOCAL
DCL TEMP[1], LOCAL
IMM[0] UINT32 {4294967295, 0, 0, 0}
IMM[1] FLT32 {    0.0000,     1.0000,     0.0000,     0.0000}
  0: SEQ TEMP[0].x, CONST[3].xxxx, IMM[0].xxxx
  1: F2I TEMP[0].x, -TEMP[0]
  2: SEQ TEMP[1].x, CONST[4].xxxx, IMM[0].xxxx
  3: F2I TEMP[1].x, -TEMP[1]
  4: AND TEMP[0].x, TEMP[0].xxxx, TEMP[1].xxxx
  5: IF TEMP[0].xxxx :0
  6:   MOV TEMP[0], IMM[1].xyxy
  7: ELSE :0
  8:   MOV TEMP[0], IMM[1].yxxy
  9: ENDIF
 10: MOV OUT[1], TEMP[0]
 11: MOV OUT[0], IN[0]
 12: END

instead of

VERT
DCL IN[0]
DCL OUT[0], POSITION
DCL OUT[1], GENERIC[12]
DCL CONST[0..4]
DCL TEMP[0], LOCAL
DCL TEMP[1], LOCAL
IMM UINT32 {4294967295, 0, 0, 0}
IMM FLT32 {    0.0000,     1.0000,     0.0000,     0.0000}
  0: SEQ TEMP[0].x, CONST[3].xxxx, IMM[0].xxxx
  1: F2I TEMP[0].x, -TEMP[0]
  2: SEQ TEMP[1].x, CONST[4].xxxx, IMM[0].xxxx
  3: F2I TEMP[1].x, -TEMP[1]
  4: AND TEMP[0].x, TEMP[0].xxxx, TEMP[1].xxxx
  5: IF TEMP[0].xxxx :0
  6:   MOV TEMP[0], IMM[1].xyxy
  7: ELSE :0
  8:   MOV TEMP[0], IMM[1].yxxy
  9: ENDIF
 10: MOV OUT[1], TEMP[0]
 11: MOV OUT[0], IN[0]
 12: END

12 years agogallivm: fix rsqrt failures
Roland Scheidegger [Fri, 21 Sep 2012 15:03:48 +0000 (17:03 +0200)]
gallivm: fix rsqrt failures

lp_build_rsqrt initially did not do any newton-raphson step. This meant that
precision was only ~11 bits, but this handled both input 0.0 and +infinity
correctly. It did not however handle input 1.0 accurately, and denormals
always generated infinity result.
Doing a newton-raphson step increased precision significantly (but notably
input 1.0 still doesn't give output 1.0), however this fails for inputs
0.0 and infinity (both result in NaNs).
Try to fix this up by using cmp/select but since this is all quite fishy
(and still doesn't handle denormals) disable for now. Note that even with
workarounds it should still have been faster since the fallback uses sqrt/div
(which both use the usually unpipelined and slow divider hw).
Also add some more test values to lp_test_arit and test lp_build_rcp() too while
there.

v2: based on José's feedback, avoid hacky infinity definition which doesn't
work with msvc (unfortunately using INFINITY won't cut it neither on non-c99
compilers) in lp_build_rsqrt, and while here fix up the input infinity case
too (it's disabled anyway). Only test infinity input case if we have c99,
and use float cast for calculating reference rsqrt value so we really get
what we expect.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agogalahad: galahad_context_blit
José Fonseca [Fri, 12 Oct 2012 17:36:22 +0000 (18:36 +0100)]
galahad: galahad_context_blit

must unwrap.

12 years agor600g: move shader structures into r600_shader.h
Marek Olšák [Fri, 12 Oct 2012 16:30:51 +0000 (18:30 +0200)]
r600g: move shader structures into r600_shader.h

12 years agomesa/st: Fix assertions.
José Fonseca [Fri, 12 Oct 2012 16:02:55 +0000 (17:02 +0100)]
mesa/st: Fix assertions.

Can't access ptDraw before it is written.

12 years agodoxygen: add gbm to .gitignore
Andreas Boll [Fri, 12 Oct 2012 15:44:19 +0000 (17:44 +0200)]
doxygen: add gbm to .gitignore

12 years agor600g: implement MSAA resolving for 8-bit and 16-bit integer formats
Marek Olšák [Fri, 12 Oct 2012 04:04:01 +0000 (06:04 +0200)]
r600g: implement MSAA resolving for 8-bit and 16-bit integer formats

by changing the format to NORM.

12 years agointel: print debug either to stdout or `logcat' depending on platform.
Oliver McFadden [Tue, 25 Sep 2012 14:47:45 +0000 (17:47 +0300)]
intel: print debug either to stdout or `logcat' depending on platform.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agoutil: fix broken pipe_get_tile_rgba() call
Brian Paul [Thu, 11 Oct 2012 21:51:02 +0000 (15:51 -0600)]
util: fix broken pipe_get_tile_rgba() call

Fix breakage from commit 369e468.

12 years agoradeon/llvm: Fix build with LLVM 3.2
Tom Stellard [Wed, 10 Oct 2012 21:00:13 +0000 (21:00 +0000)]
radeon/llvm: Fix build with LLVM 3.2

12 years agoclover: Fix build with LLVM 3.2
Tom Stellard [Wed, 10 Oct 2012 20:22:22 +0000 (20:22 +0000)]
clover: Fix build with LLVM 3.2

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
12 years agoclover: Don't link against libclangRewrite
Tom Stellard [Wed, 10 Oct 2012 13:55:19 +0000 (13:55 +0000)]
clover: Don't link against libclangRewrite

This library does not exist in LLVM 3.2 and libOpenCL.so links fine
without it on LLVM 3.1

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
12 years agoradeonsi: handle unhandled CAPs
Marek Olšák [Thu, 11 Oct 2012 19:35:45 +0000 (21:35 +0200)]
radeonsi: handle unhandled CAPs

12 years agoradeonsi: fixup the return type of is_format_supported
Marek Olšák [Thu, 11 Oct 2012 19:32:47 +0000 (21:32 +0200)]
radeonsi: fixup the return type of is_format_supported

12 years agoradeonsi: remove unused local variables
Marek Olšák [Thu, 11 Oct 2012 19:31:36 +0000 (21:31 +0200)]
radeonsi: remove unused local variables

12 years agor600g: put user indices in the command stream for small index counts
Marek Olšák [Sun, 7 Oct 2012 20:47:49 +0000 (22:47 +0200)]
r600g: put user indices in the command stream for small index counts

This improves performance a little bit if there are lots of small indexed
draw commands.

12 years agor600g: inline r600_translate_index_buffer
Marek Olšák [Sun, 7 Oct 2012 20:13:11 +0000 (22:13 +0200)]
r600g: inline r600_translate_index_buffer

12 years agogallium: unify transfer functions
Marek Olšák [Mon, 8 Oct 2012 02:06:42 +0000 (04:06 +0200)]
gallium: unify transfer functions

"get_transfer + transfer_map" becomes "transfer_map".
"transfer_unmap + transfer_destroy" becomes "transfer_unmap".

transfer_map must create and return the transfer object and transfer_unmap
must destroy it.

transfer_map is successful if the returned buffer pointer is not NULL.
If transfer_map fails, the pointer to the transfer object remains unchanged
(i.e. doesn't have to be NULL).

Acked-by: Brian Paul <brianp@vmware.com>
12 years agost/mesa: use the renderbuffer chosen by core Mesa in CopyTexSubImage
Marek Olšák [Tue, 9 Oct 2012 16:18:31 +0000 (18:18 +0200)]
st/mesa: use the renderbuffer chosen by core Mesa in CopyTexSubImage

Reviewed-by: Brian Paul <brianp@vmware.com>