Brian Paul [Mon, 24 Nov 2008 15:43:38 +0000 (08:43 -0700)]
mesa: added PROG_PARAM_ bits for invariant, flat/linear interpolation
Plus, update the print/debug code.
(cherry picked from commit
777a5c4f2e7c6c6ec0227a239b1af6c6b86dfab2)
Brian Paul [Mon, 24 Nov 2008 15:33:49 +0000 (08:33 -0700)]
mesa: add Flags field to gl_program_parameter
Only one flag defined so far: PROG_PARAM_CENTROID_BIT
(cherry picked from commit
0f228d7ab3b7c03328df369b8db50c469ac5dcd6)
Brian Paul [Sat, 22 Nov 2008 00:22:16 +0000 (17:22 -0700)]
mesa: issue error, don't crash, when calling a prototyped, but undefined function
Bug #18659.
(cherry picked from commit
4f05893415a2d6f29b29f4daf991ea95a1891a81)
Brian Paul [Fri, 21 Nov 2008 21:24:28 +0000 (14:24 -0700)]
mesa: better variable name: s/aux/store/
(cherry picked from commit
b63a31b36f2e1a198c214f41e0518991b1a8fa49)
Brian Paul [Wed, 19 Nov 2008 23:04:37 +0000 (16:04 -0700)]
mesa: minor comment reformattting
(cherry picked from commit
bab4e78734dc462387fea32f0b05103e31f2d6f6)
Brian Paul [Wed, 19 Nov 2008 22:08:46 +0000 (15:08 -0700)]
mesa: glsl compiler debug code
RETURN0 macro reports file/line before returning zero.
(cherry picked from commit
bf7f9d2143a892bc11a5e2b84e3d6d3ed69fb5e8)
Brian Paul [Wed, 19 Nov 2008 21:12:25 +0000 (14:12 -0700)]
mesa: rework GLSL array code generation
We now express arrays in terms of indirect addressing. For example:
dst = a[i];
becomes:
MOV dst, TEMP[1 + TEMP[2].y];
At instruction-emit time indirect addressing is converted into ARL/
ADDR-relative form:
ARL ADDR.x, TEMP[2].y;
MOV dst, TEMP[1 + ADDR.x];
This fixes a number of array-related issues. Arrays of arrays and complex
array/struct nesting works now.
There may be some regressions, but more work is coming.
(cherry picked from commit
ae0ff8097b85d3537a7be1674d55a44a9bd6018e)
Brian Paul [Fri, 14 Nov 2008 20:19:42 +0000 (13:19 -0700)]
mesa: don't realloc instruction buffer so often
(cherry picked from commit
e709d68d92ef6f2392b118d0a22452e8f4c53e9a)
Brian Paul [Fri, 14 Nov 2008 20:19:31 +0000 (13:19 -0700)]
mesa: updated comment
(cherry picked from commit
d9fa9e3290611944d5fd52301645367eeeb24f03)
Brian Paul [Tue, 6 Jan 2009 15:48:27 +0000 (08:48 -0700)]
mesa: fix merge conflict left-overs
Brian Paul [Fri, 14 Nov 2008 01:18:07 +0000 (18:18 -0700)]
mesa: no longer need Writemask field in GLSL IR nodes
The Swizzle and Size fields carry all the info we need now.
(cherry picked from commit
80d6379722a1249ce13db79a898d340644936f67)
Brian Paul [Fri, 14 Nov 2008 00:02:11 +0000 (17:02 -0700)]
mesa: revamp GLSL instruction emit code
This is a step toward better array handling code. In particular, when more
than one operand of an instruction uses indirect addressing, we'll need some
temporary instructions and registers. By converting IR storage to instruction
operands all in one place (emit_instruction()) we can be smarter about this.
Also, somewhat better handling of dst register swizzle/writemask handling.
This results in tighter writemasks on some instructions which is good for
SOA execution.
And, cleaner instruction commenting with inst_comment().
Next: remove some more dead code and additional clean-ups...
(cherry picked from commit
3a7ed9779b159f9dccbc98d1d556be2cd83cc1fd)
Brian Paul [Tue, 6 Jan 2009 15:47:05 +0000 (08:47 -0700)]
mesa: make writemask_string() non-static
(cherry picked from commit
610c2461ce0683ca5412e4b2b7a496f67e9d3704)
Conflicts:
src/mesa/shader/prog_print.c
Brian Paul [Thu, 13 Nov 2008 23:31:27 +0000 (16:31 -0700)]
mesa: remove some do-nothing GLSL code
(cherry picked from commit
4c167f8fc1e56b6c82d8917c237e70531e3d57b9)
Brian Paul [Tue, 6 Jan 2009 15:45:53 +0000 (08:45 -0700)]
mesa: fix accidental regression in GLSL built-in texture matrix lookup
Was broken by commit
9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.
(cherry picked from commit
fe984aed5a9ee7c6e000d48a0a584b964fefa848)
Conflicts:
src/mesa/shader/slang/slang_builtin.c
Brian Paul [Wed, 12 Nov 2008 23:47:03 +0000 (16:47 -0700)]
mesa: remove unused/obsolete __NormalMatrixTranspose matrix
(cherry picked from commit
e556cc82f83716a734ed9d76356ba49bb670004f)
Brian Paul [Wed, 12 Nov 2008 18:12:10 +0000 (11:12 -0700)]
mesa: tweak program register printing for RelAddr case
(cherry picked from commit
557fde9531289b4388a3080b89c2ebaa38abeaee)
Brian Paul [Tue, 6 Jan 2009 15:42:40 +0000 (08:42 -0700)]
mesa: allow relative indexing into all register files and indirect dst register indexing
(cherry picked from commit
f4361540f8dd3016571523863b33481cba7a0c07)
Conflicts:
src/mesa/shader/prog_execute.c
Brian Paul [Mon, 10 Nov 2008 19:33:17 +0000 (12:33 -0700)]
mesa: track initialization status of uniform variables. Plus, asst clean-ups.
(cherry picked from commit
2d76a0d77af7be9539f89cba37ce84338c1cdda4)
Brian Paul [Mon, 10 Nov 2008 18:42:42 +0000 (11:42 -0700)]
mesa: initial support for uniform variable initializers.
This lets one specify initial values for uniforms in the code, avoiding
the need to call glUniform() in some cases.
(cherry picked from commit
379ff8c9567940ebff44870cf7b0202882445fa6)
Brian Paul [Mon, 10 Nov 2008 17:25:01 +0000 (10:25 -0700)]
mesa: allows 'f' suffix on GLSL float literals
(cherry picked from commit
80c8017a643dfb655e4e1500e1c57e3908529c27)
Brian Paul [Tue, 6 Jan 2009 15:36:30 +0000 (08:36 -0700)]
mesa: add support for 'centroid' qualifier in GLSL 1.20
(cherry picked from commit
87d1a26ba38e75f6988e094dbfbc0f77c0ae502b)
Conflicts:
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Brian Paul [Tue, 6 Jan 2009 15:35:16 +0000 (08:35 -0700)]
mesa: add support for 'invariant' keyword for GLSL 1.20
(cherry picked from commit
448156f769ebf271a6a8c03c61588c3e6c6363f0)
Conflicts:
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Brian Paul [Fri, 7 Nov 2008 21:28:00 +0000 (14:28 -0700)]
mesa: reformat comments, rewrap lines, etc for a little better readability
(cherry picked from commit
b632e5aa7f948ed5bbf7104682ec3ee463af4c0a)
Brian Paul [Fri, 19 Dec 2008 23:14:48 +0000 (16:14 -0700)]
gallium: Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV
This is copied from Ian's commit
a330933bb75c38148668637cd22b90d75d39506f
José Fonseca [Tue, 30 Dec 2008 17:13:38 +0000 (17:13 +0000)]
scons: Specify C99 throughout all the tree.
MSVC may not support full C99, but supports more than plain C90. And
-pedantic without -std=c99 generates too many spurious warnings
(specially C++ style comments) to be of any use.
Note that using certain C99 features in the cross-platform parts of Gallium
is still not possible; namely mid-of-scope variable declarations and named
structure initializers will break MSVC builds.
Brian Paul [Fri, 7 Nov 2008 20:02:43 +0000 (13:02 -0700)]
gallium: implement TGSI_OPCODE_DP2A, add sqrt to NRM3/NRM4
Keith Whitwell [Tue, 23 Dec 2008 18:16:49 +0000 (18:16 +0000)]
tgsi: fix incomplete rename of loop counter variable
Keith Whitwell [Tue, 23 Dec 2008 13:26:25 +0000 (13:26 +0000)]
draw: allow driver-override of draw_need_pipeline()
Michal Krol [Tue, 23 Dec 2008 14:13:59 +0000 (15:13 +0100)]
tgsi: Dump indirect register swizzle.
Michal Krol [Fri, 14 Nov 2008 12:31:06 +0000 (13:31 +0100)]
tgsi: Return 0.0 for negative constant register indices.
Michal Krol [Fri, 14 Nov 2008 12:26:01 +0000 (13:26 +0100)]
tgsi: Keep address register as a floating point.
José Fonseca [Mon, 22 Dec 2008 20:23:59 +0000 (20:23 +0000)]
softpipe: Don't fill surfaces's winsys fields.
This is sometimes checked to distinguish between texture views and
(deprecated) standalone surfaces.
José Fonseca [Mon, 22 Dec 2008 20:20:58 +0000 (20:20 +0000)]
softpipe: Call surface_alloc_storage to get the pipebuffer for display targets.
Otherwise blitting from display target surfaces to front screen fails in
several platforms.
Jerome Glisse [Thu, 18 Dec 2008 18:56:45 +0000 (19:56 +0100)]
softpipe: initialize refcount and winsys
Jerome Glisse [Thu, 18 Dec 2008 12:34:27 +0000 (13:34 +0100)]
softpipe: convert to use texture instead of surface
José Fonseca [Mon, 22 Dec 2008 16:55:27 +0000 (16:55 +0000)]
gallium: const correctness.
José Fonseca [Sun, 21 Dec 2008 13:48:43 +0000 (13:48 +0000)]
Ignore new tests executables.
José Fonseca [Sat, 20 Dec 2008 12:59:51 +0000 (12:59 +0000)]
gallium: Fix typo in define name.
José Fonseca [Fri, 19 Dec 2008 20:06:11 +0000 (20:06 +0000)]
gallium: Simple and efficient cache.
Fixed size hash table. Collisions are handled by simply destroying the
previous entry.
It hasn't received much testing yet.
Brian Paul [Fri, 19 Dec 2008 14:33:17 +0000 (07:33 -0700)]
gallium: replace #elif with #else
Brian Paul [Fri, 19 Dec 2008 01:06:38 +0000 (18:06 -0700)]
tgsi: scan for additional info: uses_fogcoord, uses_frontfacing
Brian Paul [Thu, 18 Dec 2008 23:00:20 +0000 (16:00 -0700)]
gallium: fix two-sided lighting test in state tracker
This fixes two-sided lighting for vertex shaders.
Robert Ellison [Thu, 18 Dec 2008 16:46:53 +0000 (09:46 -0700)]
Gallium: fix for conform test
The following construction in util_surface_copy() in
gallium/auxiliary/util/u_rect.c, introduced in commit
d177c9ddda2c452cf7d6696d89cf4458ef986f98, incorrectly inverts
the Y coordinate in the last parameter to pipe_copy_rect().
/* If do_flip, invert src_y position and pass negative src stride
*/
pipe_copy_rect(dst_map,
&dst->block,
dst->stride,
dst_x, dst_y,
w, h,
src_map,
do_flip ? -(int) src->stride : src->stride,
src_x,
do_flip ? w - src_y : src_y);
The intention is to start at the last Y coordinate line and move
backwards, in the case of a flip; in that case, the correct
calculation is "src_y + h - 1", not "w - src_y".
This fixes a Gallium assertion failure in the conformance tests:
u_rect.c:65:pipe_copy_rect: Assertion `src_y >= 0' failed.
debug_get_bool_option: GALLIUM_ABORT_ON_ASSERT = TRUE
Trace/breakpoint trap
Michal Krol [Thu, 18 Dec 2008 17:45:32 +0000 (18:45 +0100)]
glsl: Fix handling of nested parens in macro actual arguments.
Eric Anholt [Wed, 8 Oct 2008 01:47:31 +0000 (18:47 -0700)]
mesa: Pass the context to query object delete cb to avoid null dereference.
José Fonseca [Thu, 18 Dec 2008 14:53:24 +0000 (14:53 +0000)]
gallium: Enable memory debugging on all windows platforms.
Brian Paul [Thu, 18 Dec 2008 02:01:34 +0000 (19:01 -0700)]
mesa: choose GLSL vertex shader over ARB/internal vertex program in get_fp_input_mask()
This is a work-around the for the fact that we do fragment shader state
validation before vertex shader validation (see comments in state.c) so in
get_fp_input_mask() we can't rely on ctx->VertexProgram._Current being up to
date yet.
This fixes a glean glsl1 test failure.
Brian Paul [Thu, 18 Dec 2008 01:52:10 +0000 (18:52 -0700)]
gallium: fix memory corruption in u_gen_mipmap.c
Remove the old/initial vbuf allocation in util_create_gen_mipmap().
We were allocating a small vbuf at this point so get_next_slot() didn't have
as large of buffer as it expected. So all but the first set_vertex_data()
was writing out of bounds.
Also added some comments.
Brian Paul [Wed, 17 Dec 2008 21:04:03 +0000 (14:04 -0700)]
mesa: fix fixed-function test in get_fp_input_mask() - again.
The problem we're solving only occured when there was a user-defined
vertex shader but no fragment shader. Check for that case now.
Fixes glean api2 vertex array failure.
Brian Paul [Wed, 17 Dec 2008 20:17:15 +0000 (13:17 -0700)]
mesa: add missing cases for texture array targets
Brian Paul [Wed, 17 Dec 2008 18:29:42 +0000 (11:29 -0700)]
Revert "mesa: fix vertex program test in get_fp_input_mask()"
This reverts commit
cdaaf8e107010624bed4abdf9553c0ef63c8b708.
Brian Paul [Wed, 17 Dec 2008 17:55:40 +0000 (10:55 -0700)]
mesa: fix vertex program test in get_fp_input_mask()
We were accidentally using the fixed-function logic when a vertex shader was
being used.
Brian Paul [Wed, 17 Dec 2008 17:55:29 +0000 (10:55 -0700)]
winsys: fix depth buffer size when using stencil
Michal Krol [Mon, 15 Dec 2008 11:29:34 +0000 (12:29 +0100)]
gallium: Fix PIPE_FORMAT_X8B8G8R8_SNORM definition.
Keith Whitwell [Fri, 12 Dec 2008 18:34:49 +0000 (18:34 +0000)]
gallium: fix refcount bug introduced in
eb20e2984
Keith Whitwell [Fri, 12 Dec 2008 17:41:49 +0000 (17:41 +0000)]
Merge branch 'no-validate' into gallium-0.1
Keith Whitwell [Fri, 12 Dec 2008 16:46:34 +0000 (16:46 +0000)]
gallium: avoid mapping same vertex buffer in subsequent frames
Quite a few util modules were maintaining a single vertex buffer over multiple
frames, and potentially reusing it in subsequent frames. Unfortunately that
would force us into syncrhonous rendering as the buffer manager would be
forced to wait for the previous rendering to complete prior to allowing the
map.
This resolves that issue, but requires the state tracker to issue a few new
flush() calls at the end of each frame.
Keith Whitwell [Wed, 10 Dec 2008 15:43:21 +0000 (15:43 +0000)]
st: reduce unnecessary calls to pipe->set_vertex_buffers()
Keith Whitwell [Wed, 10 Dec 2008 15:42:28 +0000 (15:42 +0000)]
st: move feedback draw function to new file
Keith Whitwell [Wed, 10 Dec 2008 15:41:48 +0000 (15:41 +0000)]
st: don't unilaterally ABS the argument to RSQ
Keith Whitwell [Fri, 12 Dec 2008 12:05:39 +0000 (12:05 +0000)]
Revert "pipebuffer: Implement proper buffer validation."
This reverts commit
a6d866f72c88d48d2bcfb3e3c882fdb639b5a8ce.
Keith Whitwell [Fri, 12 Dec 2008 12:05:30 +0000 (12:05 +0000)]
Revert "pipebuffer: Ondemand buffer manager."
This reverts commit
17849eafaacfbb2124d86f561a91b707317d3b31.
Keith Whitwell [Fri, 12 Dec 2008 12:05:21 +0000 (12:05 +0000)]
Revert "pipebuffer: Fix buffer overflow."
This reverts commit
55839ae064d64b7fcc180fcddb364bf31ab760dc.
José Fonseca [Thu, 20 Nov 2008 20:26:52 +0000 (05:26 +0900)]
glut: MinGW portability fixes.
Still, it doesn't run as well as the glut binaries...
José Fonseca [Thu, 20 Nov 2008 20:25:31 +0000 (05:25 +0900)]
gdi: Reimplement using the WGL statetracker.
José Fonseca [Thu, 20 Nov 2008 20:24:35 +0000 (05:24 +0900)]
mesa: Bring in new mesa sub-statetracker.
Some code cleanup is still in order.
José Fonseca [Fri, 12 Dec 2008 03:37:21 +0000 (12:37 +0900)]
scons: Build progs.
Just demos and trivial dirs for starters.
Conflicts:
.gitignore
José Fonseca [Fri, 12 Dec 2008 00:44:47 +0000 (09:44 +0900)]
scons: Allow to request the winddk toolchain.
Keith Whitwell [Wed, 10 Dec 2008 15:43:21 +0000 (15:43 +0000)]
st: reduce unnecessary calls to pipe->set_vertex_buffers()
Keith Whitwell [Wed, 10 Dec 2008 15:42:28 +0000 (15:42 +0000)]
st: move feedback draw function to new file
Keith Whitwell [Wed, 10 Dec 2008 15:41:48 +0000 (15:41 +0000)]
st: don't unilaterally ABS the argument to RSQ
Michal Krol [Thu, 11 Dec 2008 12:55:55 +0000 (13:55 +0100)]
softpipe: Add missing header include.
Michal Krol [Thu, 11 Dec 2008 12:54:05 +0000 (13:54 +0100)]
draw: Silencium compiler warnings on Windows.
Brian Paul [Thu, 11 Dec 2008 01:02:27 +0000 (18:02 -0700)]
gallium: added draw_set_mrd() function to fix polygon offset
The Minimum Resolvable Depth factor depends on the driver and can't just
be computed from the number of Z buffer bits.
Glean's polygon offset test now passes with softpipe.
Still need to determine the MRD factor for other gallium drivers, if they use
the draw module's polygon offset stage...
Brian Paul [Thu, 11 Dec 2008 01:00:59 +0000 (18:00 -0700)]
gallium: only mark back color buffer surfaces as undefined after swapbuffers
Marking all surfaces as undefined was wrong and cause some glean failures
because glReadPixels was used after SwapBuffers.
Brian Paul [Thu, 11 Dec 2008 01:00:36 +0000 (18:00 -0700)]
gallium: restore default_depth_bits() call in xlib winsys
This was accidentally disabled in a long-ago commit.
Keith Whitwell [Tue, 25 Nov 2008 20:02:00 +0000 (20:02 +0000)]
mesa: more trivial tests
Keith Whitwell [Tue, 9 Dec 2008 16:57:53 +0000 (16:57 +0000)]
util: new funcs for triming/validating primitives
Keith Whitwell [Tue, 9 Dec 2008 16:54:16 +0000 (16:54 +0000)]
draw: add const qualifiers
José Fonseca [Tue, 9 Dec 2008 10:37:25 +0000 (19:37 +0900)]
python/retrace: Dump indices too.
José Fonseca [Tue, 9 Dec 2008 10:35:52 +0000 (19:35 +0900)]
gallium: Abort by default on windows user space.
José Fonseca [Mon, 8 Dec 2008 08:26:02 +0000 (17:26 +0900)]
python/retrace: Dump vertex buffer contents.
José Fonseca [Mon, 1 Dec 2008 19:53:26 +0000 (11:53 -0800)]
scons: Target Windows XP on userspace.
Michal Krol [Wed, 26 Nov 2008 21:29:49 +0000 (22:29 +0100)]
tgsi: Reenable OPCODE_ARR.
Michal Krol [Wed, 26 Nov 2008 16:20:07 +0000 (17:20 +0100)]
tgsi: Fix build.
Michal Krol [Wed, 26 Nov 2008 11:56:23 +0000 (12:56 +0100)]
tgsi: Implement OPCODE_ROUND for SSE2 backend.
Michal Krol [Wed, 26 Nov 2008 12:54:28 +0000 (13:54 +0100)]
tgsi: Implement OPCODE_SSG/SGN.
Brian Paul [Wed, 26 Nov 2008 14:41:19 +0000 (07:41 -0700)]
gallium: disable TGSI_OPCODE_ARR case until emit_rnd() is redone.
Brian Paul [Wed, 26 Nov 2008 14:38:31 +0000 (07:38 -0700)]
Revert "tgsi: Implement OPCODE_ROUND for SSE2 backend."
This reverts commit
685fd2c035e284db2447ede0f6da278adaa70a0d.
Does not compile since emit_rnd() is trying to pass 4 params to
emit_func_call_dst() which takes 3 params.
Brian Paul [Wed, 26 Nov 2008 14:06:26 +0000 (07:06 -0700)]
gallium: fix glBitmap color bug
By time we get around to rendering the cached bitmap, the current color may
have changed. Need to make sure we load the constant slot with the cached
color.
Brian Paul [Wed, 26 Nov 2008 14:06:14 +0000 (07:06 -0700)]
gallium: replace 2 with PIPE_SHADER_TYPES
Michal Krol [Wed, 26 Nov 2008 12:17:25 +0000 (13:17 +0100)]
tgsi: Implement OPCODE_ARR.
Michal Krol [Wed, 26 Nov 2008 11:56:23 +0000 (12:56 +0100)]
tgsi: Implement OPCODE_ROUND for SSE2 backend.
José Fonseca [Tue, 25 Nov 2008 05:01:40 +0000 (14:01 +0900)]
pipebuffer: Fix buffer overflow.
Brian Paul [Tue, 25 Nov 2008 01:37:18 +0000 (18:37 -0700)]
gallium: fix inverted raster pos when drawing into FBO
José Fonseca [Mon, 24 Nov 2008 14:17:49 +0000 (23:17 +0900)]
pipebuffer: Ondemand buffer manager.
A variation of malloc buffers which get transferred to real graphics memory
when there is an attempt to validate them.
José Fonseca [Mon, 24 Nov 2008 04:59:06 +0000 (13:59 +0900)]
pipebuffer: Implement proper buffer validation.
José Fonseca [Mon, 24 Nov 2008 04:45:19 +0000 (13:45 +0900)]
gallium: Define convenience shortcuts for CPU/GPU READ/WRITE flag combinations.
José Fonseca [Mon, 24 Nov 2008 04:44:30 +0000 (13:44 +0900)]
mesa: Don't call fence_finish with a null fence.