Ian Romanick [Thu, 30 Jul 2009 16:41:35 +0000 (09:41 -0700)]
ARB prog parser: Prevent NULL ptr deref for KIL instruction
The KIL instruction doesn't have a destination register, so
dereferencing dst in asm_instruction_ctor would cause a segfault.
Ian Romanick [Thu, 30 Jul 2009 04:07:41 +0000 (21:07 -0700)]
ARP prog parser: Implement the spec, not what makes sense
Ian Romanick [Thu, 30 Jul 2009 03:51:38 +0000 (20:51 -0700)]
ARB prog parser: Get program limits from the context
Some debug code from the older stand-alone version of the assembler
was hanging around and needed to go.
Ian Romanick [Thu, 30 Jul 2009 03:42:28 +0000 (20:42 -0700)]
ARB prog lexer: attenuation is not just for vp
Ian Romanick [Thu, 30 Jul 2009 03:41:48 +0000 (20:41 -0700)]
ARB prog parser: Finish implementing fp state.depth.range
Ian Romanick [Thu, 30 Jul 2009 03:07:59 +0000 (20:07 -0700)]
ARB prog: Fix the order of swizzle application
The swizzle used to generate the "original" value from the value
stored in the parameter array happens before the swizzle specified in
the instruction. This fixes problems seen in progs/vp/vp-tris with arl-*.txt.
Ian Romanick [Wed, 29 Jul 2009 16:50:06 +0000 (09:50 -0700)]
Indentation fixes.
Ian Romanick [Wed, 29 Jul 2009 16:47:14 +0000 (09:47 -0700)]
ARB prog parser: Set NumAttributes based on the number of attribs read
Ian Romanick [Wed, 29 Jul 2009 04:57:28 +0000 (21:57 -0700)]
ARB prog parser: Set component negation mask for SWZ instruction
Ian Romanick [Wed, 29 Jul 2009 04:56:42 +0000 (21:56 -0700)]
ARB prog parser: Set correct register file for OUTPUT variables
Ian Romanick [Tue, 28 Jul 2009 00:22:21 +0000 (17:22 -0700)]
ARB prog parser: Add support for GL_MESA_texture_array
This isn't really tested yet as no drivers actually support this extension.
Ian Romanick [Mon, 27 Jul 2009 23:33:16 +0000 (16:33 -0700)]
ARB prog parser: More robust error message for bad OPTION string
Ian Romanick [Mon, 27 Jul 2009 23:24:49 +0000 (16:24 -0700)]
ARB prog parser: Add support for GL_ARB_fragment_program_shadow
Passes the piglit asmparsertest shadow-0[123].txt tests and
progs/demos/shadowtex.
Ian Romanick [Mon, 27 Jul 2009 22:47:52 +0000 (15:47 -0700)]
ARB prog parser: Fix handling of RECT
Require that GL_{ARB,EXT,NV}_texture_rectangle be supported before
allowing use of RECT texture target.
Ian Romanick [Mon, 27 Jul 2009 22:46:07 +0000 (15:46 -0700)]
ARB prog: Fix parameters to _mesa_calloc
So totally awesome that _mesa_calloc has a different parameter
signature than calloc. Why do these libc wrappers still exist?!?
Ian Romanick [Mon, 27 Jul 2009 21:11:38 +0000 (14:11 -0700)]
ARB prog parser: Correct handling of some extensions that interact w/ARB_vp
Ian Romanick [Mon, 27 Jul 2009 19:48:44 +0000 (12:48 -0700)]
ARB prog: Update generated files missed on previous two commits
The changes are, as it turns out, purely cosmetic.
Ian Romanick [Mon, 27 Jul 2009 19:38:52 +0000 (12:38 -0700)]
ARB prog: Delete comment about possibly needing to free a buffer
Valgrind doesn't complain about a leak here, so delete the comment
about possibly needing to free the state returned by yy_scan_bytes.
Ian Romanick [Mon, 27 Jul 2009 19:21:26 +0000 (12:21 -0700)]
ARB prog: Clean up several memory leaks
As far as I am able to determine via code inspection and using
Valgrind, that should be all of the leaks in the parser.
Ian Romanick [Mon, 27 Jul 2009 19:19:14 +0000 (12:19 -0700)]
Add destructor for symbol_table
Ian Romanick [Mon, 27 Jul 2009 19:17:06 +0000 (12:17 -0700)]
Add destructor for hash_table
Ian Romanick [Sat, 25 Jul 2009 01:14:47 +0000 (18:14 -0700)]
ARB prog: Layout parameters from parameter type, not src type
Use the type stored in the Parameters array to determine the layout
instead of the type in the instruction register field. Also, update
the instruction register field based on the parameter type.
This makes Google Earth work exactly like with Mesa master.
Ian Romanick [Sat, 25 Jul 2009 01:03:02 +0000 (18:03 -0700)]
ARB prog: _mesa_print_program output should go to same place as _mesa_printf
Ian Romanick [Sat, 25 Jul 2009 01:01:59 +0000 (18:01 -0700)]
ARB prog parse: Fix cut-and-paste error for constant vectors
Ian Romanick [Sat, 25 Jul 2009 00:33:30 +0000 (17:33 -0700)]
ARB prog: get frag prog texture info from the right place
This gets basic texturing working. w00t!
Ian Romanick [Thu, 23 Jul 2009 00:13:08 +0000 (17:13 -0700)]
parser: Clean up a bunch of silly compiler warnings
Ian Romanick [Wed, 22 Jul 2009 23:21:54 +0000 (16:21 -0700)]
parser: Track a few more frag prog related values
Ian Romanick [Wed, 22 Jul 2009 23:03:32 +0000 (16:03 -0700)]
parser: Ensure that param_binding_type is set correctly
Ian Romanick [Wed, 22 Jul 2009 22:28:31 +0000 (15:28 -0700)]
GIT ignore program_parse.output
Ian Romanick [Wed, 22 Jul 2009 22:27:31 +0000 (15:27 -0700)]
parser: Set NumParameters
Ian Romanick [Wed, 22 Jul 2009 22:06:49 +0000 (15:06 -0700)]
parser: Clean up generation of error strings during assembly
Ian Romanick [Wed, 22 Jul 2009 19:29:48 +0000 (12:29 -0700)]
parser: Initialize unused instruction source registers
The 965 driver expects unused source registers (e.g., SrcReg[2] of a
DP3 instruction) to have a register file of PROGRAM_UNDEFINED.
Initializing these source registers ensures that this happens.
Ian Romanick [Wed, 22 Jul 2009 17:51:18 +0000 (10:51 -0700)]
parser: Anonymous constants come from the PROGRAM_CONSTANT file
Ian Romanick [Tue, 21 Jul 2009 00:44:36 +0000 (17:44 -0700)]
ARB_fp/vp: Initial import of new ARB vp/fp assembler
This still needs quite a bit of work, but a bunch of the programs in progs/vp
produce correct results.
Ian Romanick [Wed, 8 Jul 2009 18:39:13 +0000 (11:39 -0700)]
Add new _mesa_new_parameter_list_sized to pre-allocate a parameter list
Keith Whitwell [Mon, 20 Jul 2009 18:45:24 +0000 (19:45 +0100)]
tgsi: get texturing working in vertex shader sse2 path
Missing file from previous commit.
Michel Dänzer [Mon, 20 Jul 2009 18:41:11 +0000 (20:41 +0200)]
Merge branch 'mesa_7_5_branch'
Michel Dänzer [Mon, 20 Jul 2009 18:26:28 +0000 (20:26 +0200)]
radeon: With DRI1, if we have HW stencil, only expose fbconfigs with stencil.
Otherwise simple apps like glxgears pick up a DirectColor visual since the X
server mixes the depth 32 visual in with the other GLX visuals, and this seems
to result in a (mostly) black screen due to a bad ColorMap for a lot of people.
The bad ColorMap may be a bug in the apps, the X server or X driver, and
regardless of that I think the X server should ideally make the depth 32 GLX
visual separate from the rest again, but in the meantime this makes us cope.
(depth_bits is either 16 or 24, never 0)
Keith Whitwell [Mon, 20 Jul 2009 18:29:22 +0000 (19:29 +0100)]
tgsi: get texturing working in vertex shader sse2 path
Keith Whitwell [Mon, 20 Jul 2009 18:28:34 +0000 (19:28 +0100)]
tgsi: fix regression in indexed const lookups
This function was calling get_input_base() and get_output_base() to
get the names of a couple of register to use as temps. Those
functions no longer return registers, so adjust it to get the
registers elsewhere.
This change doesn't address the issue that it's a fairly poor way to
grab a register name by calling a function with an apparently
unrelated meaning.
Kevin DeKorte [Mon, 20 Jul 2009 13:27:17 +0000 (09:27 -0400)]
r600: Fix compilation
Cooper Yuan [Mon, 20 Jul 2009 09:42:47 +0000 (17:42 +0800)]
R6xx/r7xx: Fix line stipple and width issue
Michel Dänzer [Mon, 20 Jul 2009 00:11:17 +0000 (02:11 +0200)]
Add common_ppc.c to MESA_GALLIUM_SOURCES.
Michel Dänzer [Mon, 20 Jul 2009 00:06:37 +0000 (02:06 +0200)]
r300g: Fix SCons build.
Michel Dänzer [Mon, 20 Jul 2009 00:05:38 +0000 (02:05 +0200)]
gallium/trace: Fix SCons build.
Michel Dänzer [Sun, 19 Jul 2009 23:53:15 +0000 (01:53 +0200)]
r300g: Guard R500 register writes by is_r500 check.
Flagged by the DRM command stream checker. This allows the driver to work on
non-R500 cards.
Dave Airlie [Sat, 18 Jul 2009 07:44:44 +0000 (17:44 +1000)]
gallium: make g3dvl build again
Brian Paul [Sat, 18 Jul 2009 04:00:47 +0000 (22:00 -0600)]
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
progs/glsl/multitex.c
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
Alex Deucher [Fri, 17 Jul 2009 23:04:19 +0000 (19:04 -0400)]
R6xx/R7xx: add fine grained syncing support
Alex Deucher [Fri, 17 Jul 2009 21:08:40 +0000 (17:08 -0400)]
R6xx/r7xx: send depth state in it's own function
Andrew Randrianasulu [Fri, 17 Jul 2009 22:55:12 +0000 (00:55 +0200)]
st/egl: Fix broken build after EGL thread changes
Alex Deucher [Fri, 17 Jul 2009 22:10:48 +0000 (18:10 -0400)]
R200: fix build when RADEON_DEBUG_BO is set
Dave Airlie [Fri, 17 Jul 2009 22:00:23 +0000 (08:00 +1000)]
radeon: disable BO debug
Brian Paul [Fri, 17 Jul 2009 20:43:29 +0000 (14:43 -0600)]
progs/util: remove extfuncs.h (we use GLEW instead)
Brian Paul [Fri, 17 Jul 2009 19:36:06 +0000 (13:36 -0600)]
egl: commit missing eglcurrent.[ch] files
Not sure how these got left out from earlier commit.
Brian Paul [Fri, 17 Jul 2009 19:23:11 +0000 (13:23 -0600)]
progs/glsl: finish conversion to GLEW
This is a follow-on to
b799af91d5ffbee1481161fec29eb4c92b161272.
Remove _func function suffix and unneeded #includes.
Alex Deucher [Fri, 17 Jul 2009 18:46:40 +0000 (14:46 -0400)]
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
Kevin DeKorte [Fri, 17 Jul 2009 18:43:42 +0000 (14:43 -0400)]
R6xx/r7xx: warning fixes
patch from Kevin DeKorte with some minor fixes from me.
Brian Paul [Fri, 17 Jul 2009 18:40:48 +0000 (12:40 -0600)]
mesa: set version to 7.5
Brian Paul [Fri, 17 Jul 2009 18:40:44 +0000 (12:40 -0600)]
mesa: set version to 7.5
Brian Paul [Fri, 17 Jul 2009 18:40:24 +0000 (12:40 -0600)]
docs: set date for 7.5 release
Chia-I Wu [Fri, 17 Jul 2009 04:21:59 +0000 (21:21 -0700)]
xeglthreads: Check current context for EGL per-thread support.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:56:00 +0000 (11:56 -0600)]
egl: Remove redundant DeletePending flag.
A context or surface that is neither linked to a display nor current to
a thread should be destroyed. Therefore, an unlinked context or surface
implies a pending delete automatically.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 04:21:57 +0000 (21:21 -0700)]
egl: Destroy display's resources upon termination.
eglTerminate should destroy the contexts and surfaces of the display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 04:21:56 +0000 (21:21 -0700)]
egl: Return the same EGL Display for the same native display.
The latest revision of the spec explicitly requires the same handle to
be returned for the same native display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:53:03 +0000 (11:53 -0600)]
egl: Use the link functions to manage resources.
This commit uses the newly introduced link functions to manage EGL
contexts and surfaces. As a result of this, the API for drivers are
changed. All drivers are updated for the change.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:48:27 +0000 (11:48 -0600)]
egl: Add funtions to link contexts and surfaces to displays.
EGL contexts and surfaces are resources of displays. They should be
managed by displays. This commit adds a bunch of functions to
egldisplay.c to help establish the links between contexts/surfaces and
displays. How links are established is considered opaque outside
display. Functions like _eglGetSurfaceHandle or _eglLookupSurface are
therefore moved to egldisplay.c, with some small modifications.
The idea is also extended to display. That is, displays need to link to
themselves to be looked up.
This commit only adds the functions. A commit to use them should
follow.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:42:04 +0000 (11:42 -0600)]
egl: Extend per-thread info for multiple current contexts.
EGL allows multiple current contexts, as long as they are bound to
different client APIs.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:41:02 +0000 (11:41 -0600)]
egl: Support per-thread info.
This commit introduces a "current" system to manage per-thread info. It
uses TLS, if GLX_USE_TLS is defined, or pthread, if PTHREADS is defined.
If none of them are defined, it uses a dummy implementation that is just
like before.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 04:21:51 +0000 (21:21 -0700)]
egl: Add eglcompiler.h for compiler features.
Only INLINE (from mesa/main/compiler.h) is defined now. It may be used
to deal with symbol visibility and int/pointer conversion in the future.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Alex Deucher [Fri, 17 Jul 2009 16:21:33 +0000 (12:21 -0400)]
R6xx/r7xx: disable depth/stencil compression for now
Alex Deucher [Fri, 17 Jul 2009 16:07:15 +0000 (12:07 -0400)]
R6xx/r7xx: add some missing state regs
Brian Paul [Fri, 17 Jul 2009 15:40:45 +0000 (09:40 -0600)]
docs: news entry for 7.5 release
Brian Paul [Fri, 17 Jul 2009 15:40:28 +0000 (09:40 -0600)]
docs: update links to Gallium wiki page on freedesktop.org
Eric Anholt [Fri, 17 Jul 2009 01:41:03 +0000 (18:41 -0700)]
texenv: Calculate whether we need to do secondary color on our own.
The _TriangleCaps bit is deprecated, not updated when we require, and
is set based on state that hasn't been updated at that point in
_mesa_update_state_locked().
Fixes incorrect clear color in glsl/twoside.c with meta_clear_tris.
Eric Anholt [Thu, 16 Jul 2009 22:57:22 +0000 (15:57 -0700)]
i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.
Alex Deucher [Thu, 16 Jul 2009 21:35:44 +0000 (17:35 -0400)]
R6xx: fix rendering on r6xx/rs780 chips
You always need to emit a fetch shader (fs) even if you
aren't using it. For now, just emit the fs with the
vs address to make the kernel happy.
José Fonseca [Thu, 16 Jul 2009 18:34:44 +0000 (19:34 +0100)]
python/retrace: Process the call no passed to --to option inclusively.
José Fonseca [Thu, 16 Jul 2009 18:32:40 +0000 (19:32 +0100)]
python/retrace: Dump the surface copy contents.
José Fonseca [Thu, 16 Jul 2009 18:31:36 +0000 (19:31 +0100)]
python/retrace: Flush stdout before calling the pipe driver.
So that messages are in sync with stderr.
José Fonseca [Thu, 16 Jul 2009 18:20:25 +0000 (19:20 +0100)]
mesa: Fix logbase2.
It was providing 1 too many for non power two values.
Keith Whitwell [Thu, 16 Jul 2009 17:45:10 +0000 (18:45 +0100)]
draw: fix ppc build regression
Found by x.org tinderbox, reported by Chris Ball.
Kevin DeKorte [Thu, 16 Jul 2009 15:57:14 +0000 (11:57 -0400)]
Warning fixes
Alex Deucher [Thu, 16 Jul 2009 15:50:43 +0000 (11:50 -0400)]
R6xx/r7xx: remove unused function
Spotted by kdekorte on IRC
Brian Paul [Thu, 16 Jul 2009 14:44:51 +0000 (08:44 -0600)]
st/mesa: add some array index bounds assertions
Chia-I Wu [Thu, 16 Jul 2009 14:29:19 +0000 (08:29 -0600)]
egl: Add xeglthreads
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Richard Li [Thu, 16 Jul 2009 14:28:58 +0000 (10:28 -0400)]
Restore vp input mapping, fix vtx stream missing problem.
Keith Whitwell [Thu, 16 Jul 2009 11:49:27 +0000 (12:49 +0100)]
tgsi: simplify and fix sse KIL implementation
Use sse_movmskps to extract the correct bits of the comparison result
for use in updating the killmask. Simplify some logic around
identifying the set of necessary comparisons to make.
Keith Whitwell [Thu, 16 Jul 2009 11:47:11 +0000 (12:47 +0100)]
rtasm: export sse_movmskps
Keith Whitwell [Thu, 16 Jul 2009 10:01:19 +0000 (11:01 +0100)]
tgsi: initial texturing support on sse path
Most obvious problem is drawpixels comes out blocky, but this may be
an existing issue of KIL on the sse path.
José Fonseca [Thu, 16 Jul 2009 10:21:12 +0000 (11:21 +0100)]
python: Hack to prevent segmentation faults when python exits.
José Fonseca [Thu, 16 Jul 2009 10:20:12 +0000 (11:20 +0100)]
wgl: Expose pipe_screen/pipe_context via an extension.
José Fonseca [Thu, 16 Jul 2009 10:19:06 +0000 (11:19 +0100)]
python: Obtain pipe_screen/pipe_context from the system's OpenGL driver.
Keith Whitwell [Thu, 16 Jul 2009 09:11:46 +0000 (10:11 +0100)]
tgsi: make sse function callout mechanism more generic
Take a list of arguments rather than hardcoding TEMP_R0.
Keith Whitwell [Thu, 16 Jul 2009 06:50:34 +0000 (07:50 +0100)]
tgsi: reduce x86 reg usage in tgsi_sse generated programs
Pass the tgsi_exec_machine struct in directly and just hold a single
pointer to this struct, rather than keeping one for each of its
internal members.
Keith Whitwell [Wed, 15 Jul 2009 23:23:33 +0000 (00:23 +0100)]
tgsi: no need to separately malloc input and output arrays
Can now guarantee alignment in the initial allocation of the tgsi exec machine.
Keith Whitwell [Wed, 15 Jul 2009 23:21:17 +0000 (00:21 +0100)]
gallium: reduce recursive include of tgsi_exec.h
A lot of draw code no longer needs to see this header.
Keith Whitwell [Wed, 15 Jul 2009 22:59:55 +0000 (23:59 +0100)]
tgsi: make function call code in tgsi_sse.c less opaque
Explictly pass src and dst arguments (previously dst argument was also
being used as a src). Separate argument handling from the rest of
the function call emit.
Keith Whitwell [Wed, 15 Jul 2009 22:44:53 +0000 (23:44 +0100)]
gallium: proper constructor and destructor for tgsi_exec_machine
Centralize the creation, initialization and destruction of this struct.
Use align_malloc instead of home-brew alternatives.
Alex Deucher [Thu, 16 Jul 2009 06:59:36 +0000 (02:59 -0400)]
Fix more merge fallout