mesa.git
15 years agomesa: copy array_len in slang_fully_specified_type_copy()
Brian Paul [Fri, 12 Dec 2008 22:01:00 +0000 (15:01 -0700)]
mesa: copy array_len in slang_fully_specified_type_copy()

(cherry picked from commit c20d00f04bdbdc0d3abdae8984ff5c874c4f0a10)

15 years agomesa: remove incorrect array_len assignment
Brian Paul [Fri, 12 Dec 2008 22:00:06 +0000 (15:00 -0700)]
mesa: remove incorrect array_len assignment

(cherry picked from commit 9016331d0fd0783d1e46c9d4b651797d6af4a60f)

15 years agomesa: array size fix in _slang_typeof_operation()
Brian Paul [Fri, 12 Dec 2008 20:18:30 +0000 (13:18 -0700)]
mesa: array size fix in _slang_typeof_operation()

(cherry picked from commit 87a00959ba40ee0aeaebbc8a86ca081cf3b81c75)

15 years agomesa: fix some more GLSL 1.20 array things.
Brian Paul [Fri, 12 Dec 2008 20:05:29 +0000 (13:05 -0700)]
mesa: fix some more GLSL 1.20 array things.

Function that return arrays should work now.

(cherry picked from commit 8571401d7d7c9c91c6f053e5dc8c94a4567140fe)

15 years agomesa: more glsl function renaming
Brian Paul [Fri, 12 Dec 2008 17:32:56 +0000 (10:32 -0700)]
mesa: more glsl function renaming

(cherry picked from commit d5367622a3f1cffe67af0fb6fca99ad02eefd374)

15 years agomesa: use _slang_alloc()
Brian Paul [Fri, 12 Dec 2008 17:29:15 +0000 (10:29 -0700)]
mesa: use _slang_alloc()

(cherry picked from commit b4019483dea406e997ae1c6b61b41cc49786c8ce)

15 years agomesa: glsl compiler function renaming
Brian Paul [Fri, 12 Dec 2008 17:22:47 +0000 (10:22 -0700)]
mesa: glsl compiler function renaming

(cherry picked from commit 456a4e274ff60122ab7e23dad2d462be3d910599)

15 years agomesa: more glsl type/function movement
Brian Paul [Fri, 12 Dec 2008 17:17:58 +0000 (10:17 -0700)]
mesa: more glsl type/function movement

(cherry picked from commit 9a174ef4090189e19831092bb2bae4bfc5396968)

15 years agomesa: move some glsl compiler functions to different files to be more consistant
Brian Paul [Fri, 12 Dec 2008 17:11:41 +0000 (10:11 -0700)]
mesa: move some glsl compiler functions to different files to be more consistant

(cherry picked from commit aeeb9bca2712dbf8540486fc584e214a8af4c7c4)

15 years agomesa: move _slang_locate_function() to different file
Brian Paul [Fri, 12 Dec 2008 17:03:31 +0000 (10:03 -0700)]
mesa: move _slang_locate_function() to different file

(cherry picked from commit ea9dc3879f4cbbaa8ce9e305884a4afdc1fdd28a)

15 years agomesa: remove unused fixup table code in glsl compiler
Brian Paul [Fri, 12 Dec 2008 16:58:18 +0000 (09:58 -0700)]
mesa: remove unused fixup table code in glsl compiler

(cherry picked from commit 19ca2908be5df2240d694c67c6f190982e9f7922)

15 years agomesa: checkpoint: GLSL 1.20 array constructors
Brian Paul [Fri, 12 Dec 2008 16:56:13 +0000 (09:56 -0700)]
mesa: checkpoint: GLSL 1.20 array constructors

(cherry picked from commit ade777ea1b62e2280c9f05fa09927a8f9bb63f4f)

15 years agomesa: consolidate variable declaration initializer code for globals too
Brian Paul [Fri, 12 Dec 2008 02:34:43 +0000 (19:34 -0700)]
mesa: consolidate variable declaration initializer code for globals too

(cherry picked from commit 1737f2dbdd8d9d6b1da140340323cbf83f7bd592)

15 years agomesa: move variable initializer IR generation into _slang_gen_var_decl()
Brian Paul [Fri, 12 Dec 2008 02:28:22 +0000 (19:28 -0700)]
mesa: move variable initializer IR generation into _slang_gen_var_decl()

More code consolidation coming...

(cherry picked from commit 2760bca1e13e62943affd762ed560bc30fbcc27a)

15 years agomesa: simplify some glsl variable declaration code
Brian Paul [Fri, 12 Dec 2008 02:10:58 +0000 (19:10 -0700)]
mesa: simplify some glsl variable declaration code

(cherry picked from commit 05ed9f7fe934249eaa5a16123b5b5f7f62b0ad26)

15 years agomesa: glsl clean-ups
Brian Paul [Fri, 12 Dec 2008 01:49:28 +0000 (18:49 -0700)]
mesa: glsl clean-ups

(cherry picked from commit 929eb00b32dfea9b1ac58923c88d5573872adea1)

15 years agomesa: checkpoint commit of GLSL 1.20 array syntax.
Brian Paul [Fri, 12 Dec 2008 01:02:19 +0000 (18:02 -0700)]
mesa: checkpoint commit of GLSL 1.20 array syntax.

This allows things like float[3] x = float[3](1., 2., 3.);

Parsing and AST construction now.  Codegen not working yet.

(cherry picked from commit 2dc3de016cd0306bf5b492ed781e824864788f11)

15 years agomesa: in slang linker, replace assertion with link error when max samplers exceeded
Brian Paul [Tue, 9 Dec 2008 21:30:42 +0000 (14:30 -0700)]
mesa: in slang linker, replace assertion with link error when max samplers exceeded

(cherry picked from commit e8f5c1a5e89fe43ddfa277d7392dcaf8ac1d6c88)

15 years agomesa: fix conditional in save_Lightfv(), bug 18838
Brian [Tue, 2 Dec 2008 01:32:47 +0000 (18:32 -0700)]
mesa: fix conditional in save_Lightfv(), bug 18838

(cherry picked from commit 1e2f57425153d73646fde7c91c16aa5559491556)

15 years agomesa: add missing type check for function calls
Brian Paul [Wed, 26 Nov 2008 16:35:26 +0000 (09:35 -0700)]
mesa: add missing type check for function calls

(cherry picked from commit 001b1cbb0dacf76dd09cda56840c30226abd3534)

15 years agomesa: add missing size check for assignment optimization
Brian Paul [Wed, 26 Nov 2008 16:35:08 +0000 (09:35 -0700)]
mesa: add missing size check for assignment optimization

(cherry picked from commit aa40de5c6f7f70844d4a4c726456cceaee9f0e4d)

15 years agomesa: remove debug code
Brian Paul [Wed, 26 Nov 2008 16:02:37 +0000 (09:02 -0700)]
mesa: remove debug code

(cherry picked from commit fea3a32e17502ac16ec9a12dc9d18742cea2efd5)

15 years agogallium: added centroid/invarient fields to declarations
Brian Paul [Tue, 25 Nov 2008 16:02:27 +0000 (09:02 -0700)]
gallium: added centroid/invarient fields to declarations

(cherry picked from commit 4de360e67d83cd6503fb8ad053bb8afe507db5fa)

15 years agomesa: added support for GLSL 1.20 array.length() method
Brian Paul [Tue, 25 Nov 2008 00:18:56 +0000 (17:18 -0700)]
mesa: added support for GLSL 1.20 array.length() method

This is the only method supported in GLSL 1.20 so we take a few short-cuts.

(cherry picked from commit 8d95e66cf78921cd067c4bcf6a1053a7ec3a2ed4)

15 years agomesa: support for GLSL 1.20 array types
Brian Paul [Mon, 24 Nov 2008 22:28:21 +0000 (15:28 -0700)]
mesa: support for GLSL 1.20 array types

This allows syntax like "float[8] foo, bar;"

(cherry picked from commit 0fab514ff5e7887767936427b5e02b676abebf3a)

15 years agomesa: pass shader centroid/invariant info through to the TGSI shader
Brian Paul [Mon, 24 Nov 2008 21:36:00 +0000 (14:36 -0700)]
mesa: pass shader centroid/invariant info through to the TGSI shader

(cherry picked from commit c5b52b5e0e6f6e47c3953076fa788921b1c5a5e2)

15 years agotgsi: add tgsi_declaration fields for centroid sampling, invariant optimization
Brian Paul [Mon, 24 Nov 2008 17:02:44 +0000 (10:02 -0700)]
tgsi: add tgsi_declaration fields for centroid sampling, invariant optimization

(cherry picked from commit 434e255eae90b0f3d836d452b7d3b0c5aadf78b8)

15 years agomesa: add gl_program::Input/OutputFlags[] array
Brian Paul [Mon, 24 Nov 2008 20:04:04 +0000 (13:04 -0700)]
mesa: add gl_program::Input/OutputFlags[] array

These arrays will indicate per-input or per-output options for vertex/fragment
programs such as centroid-sampling and invariance.

(cherry picked from commit b730d0d3e9b202b17a0815cb820fc9905f35cb98)

15 years agomesa: copy centroid/invariance/precision info in parse_init_declarator()
Brian Paul [Mon, 24 Nov 2008 16:28:25 +0000 (09:28 -0700)]
mesa: copy centroid/invariance/precision info in parse_init_declarator()

(cherry picked from commit a2037137385671c0673d1de6eb1c36dbd3cd78f3)

15 years agomesa: check that varying variable qualifiers agree
Brian Paul [Mon, 24 Nov 2008 16:25:05 +0000 (09:25 -0700)]
mesa: check that varying variable qualifiers agree

(cherry picked from commit dc1107c08d0ccbeeb063f2e46be598f16cbe9f21)

15 years agomesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()
Brian Paul [Mon, 24 Nov 2008 16:13:14 +0000 (09:13 -0700)]
mesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()

(cherry picked from commit 0e2f757413a68f0edb6643ea23ad8d879d077f11)

15 years agomesa: set flags for varying vars
Brian Paul [Mon, 24 Nov 2008 16:05:49 +0000 (09:05 -0700)]
mesa: set flags for varying vars

(cherry picked from commit 3197954554bfc492283c7db009d10ab408664cad)

15 years agomesa: rename program parameter flags to match other Mesa conventions
Brian Paul [Mon, 24 Nov 2008 16:04:52 +0000 (09:04 -0700)]
mesa: rename program parameter flags to match other Mesa conventions

(cherry picked from commit f490ec9797a396da9d182f1ad4393f1c5c2df440)

15 years agomesa: copy Flags in _mesa_clone_parameter_list()
Brian Paul [Mon, 24 Nov 2008 16:04:11 +0000 (09:04 -0700)]
mesa: copy Flags in _mesa_clone_parameter_list()

(cherry picked from commit 08b825a77179a9e7ed902c9c57387f127cd007bc)

15 years agomesa: dump/debug varying vars list
Brian Paul [Mon, 24 Nov 2008 16:03:47 +0000 (09:03 -0700)]
mesa: dump/debug varying vars list

(cherry picked from commit 3f6668a4bf28109eb806be019fb235663572b7da)

15 years agomesa: added PROG_PARAM_ bits for invariant, flat/linear interpolation
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)

15 years agomesa: add Flags field to gl_program_parameter
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)

15 years agomesa: issue error, don't crash, when calling a prototyped, but undefined function
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)

15 years agomesa: better variable name: s/aux/store/
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)

15 years agomesa: minor comment reformattting
Brian Paul [Wed, 19 Nov 2008 23:04:37 +0000 (16:04 -0700)]
mesa: minor comment reformattting

(cherry picked from commit bab4e78734dc462387fea32f0b05103e31f2d6f6)

15 years agomesa: glsl compiler debug code
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)

15 years agomesa: rework GLSL array code generation
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)

15 years agomesa: don't realloc instruction buffer so often
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)

15 years agomesa: updated comment
Brian Paul [Fri, 14 Nov 2008 20:19:31 +0000 (13:19 -0700)]
mesa: updated comment

(cherry picked from commit d9fa9e3290611944d5fd52301645367eeeb24f03)

15 years agomesa: fix merge conflict left-overs
Brian Paul [Tue, 6 Jan 2009 15:48:27 +0000 (08:48 -0700)]
mesa: fix merge conflict left-overs

15 years agomesa: no longer need Writemask field in GLSL IR nodes
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)

15 years agomesa: revamp GLSL instruction emit code
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)

15 years agomesa: make writemask_string() non-static
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

15 years agomesa: remove some do-nothing GLSL code
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)

15 years agomesa: fix accidental regression in GLSL built-in texture matrix lookup
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

15 years agomesa: remove unused/obsolete __NormalMatrixTranspose matrix
Brian Paul [Wed, 12 Nov 2008 23:47:03 +0000 (16:47 -0700)]
mesa: remove unused/obsolete __NormalMatrixTranspose matrix

(cherry picked from commit e556cc82f83716a734ed9d76356ba49bb670004f)

15 years agomesa: tweak program register printing for RelAddr case
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)

15 years agomesa: allow relative indexing into all register files and indirect dst register indexing
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

15 years agomesa: track initialization status of uniform variables. Plus, asst clean-ups.
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)

15 years agomesa: initial support for uniform variable initializers.
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)

15 years agomesa: allows 'f' suffix on GLSL float literals
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)

15 years agomesa: add support for 'centroid' qualifier in GLSL 1.20
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

15 years agomesa: add support for 'invariant' keyword for GLSL 1.20
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

15 years agomesa: reformat comments, rewrap lines, etc for a little better readability
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)

15 years agogallium: Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV
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

15 years agoscons: Specify C99 throughout all the tree.
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.

15 years agogallium: implement TGSI_OPCODE_DP2A, add sqrt to NRM3/NRM4
Brian Paul [Fri, 7 Nov 2008 20:02:43 +0000 (13:02 -0700)]
gallium: implement TGSI_OPCODE_DP2A, add sqrt to NRM3/NRM4

15 years agotgsi: fix incomplete rename of loop counter variable
Keith Whitwell [Tue, 23 Dec 2008 18:16:49 +0000 (18:16 +0000)]
tgsi: fix incomplete rename of loop counter variable

15 years agodraw: allow driver-override of draw_need_pipeline()
Keith Whitwell [Tue, 23 Dec 2008 13:26:25 +0000 (13:26 +0000)]
draw: allow driver-override of draw_need_pipeline()

15 years agotgsi: Dump indirect register swizzle.
Michal Krol [Tue, 23 Dec 2008 14:13:59 +0000 (15:13 +0100)]
tgsi: Dump indirect register swizzle.

15 years agotgsi: Return 0.0 for negative constant register indices.
Michal Krol [Fri, 14 Nov 2008 12:31:06 +0000 (13:31 +0100)]
tgsi: Return 0.0 for negative constant register indices.

15 years agotgsi: Keep address register as a floating point.
Michal Krol [Fri, 14 Nov 2008 12:26:01 +0000 (13:26 +0100)]
tgsi: Keep address register as a floating point.

15 years agosoftpipe: Don't fill surfaces's winsys fields.
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.

15 years agosoftpipe: Call surface_alloc_storage to get the pipebuffer for display targets.
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.

15 years agosoftpipe: initialize refcount and winsys
Jerome Glisse [Thu, 18 Dec 2008 18:56:45 +0000 (19:56 +0100)]
softpipe: initialize refcount and winsys

15 years agosoftpipe: convert to use texture instead of surface
Jerome Glisse [Thu, 18 Dec 2008 12:34:27 +0000 (13:34 +0100)]
softpipe: convert to use texture instead of surface

15 years agogallium: const correctness.
José Fonseca [Mon, 22 Dec 2008 16:55:27 +0000 (16:55 +0000)]
gallium: const correctness.

15 years agoIgnore new tests executables.
José Fonseca [Sun, 21 Dec 2008 13:48:43 +0000 (13:48 +0000)]
Ignore new tests executables.

15 years agogallium: Fix typo in define name.
José Fonseca [Sat, 20 Dec 2008 12:59:51 +0000 (12:59 +0000)]
gallium: Fix typo in define name.

15 years agogallium: Simple and efficient cache.
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.

15 years agogallium: replace #elif with #else
Brian Paul [Fri, 19 Dec 2008 14:33:17 +0000 (07:33 -0700)]
gallium: replace #elif with #else

15 years agotgsi: scan for additional info: uses_fogcoord, uses_frontfacing
Brian Paul [Fri, 19 Dec 2008 01:06:38 +0000 (18:06 -0700)]
tgsi: scan for additional info: uses_fogcoord, uses_frontfacing

15 years agogallium: fix two-sided lighting test in state tracker
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.

15 years agoGallium: fix for conform test
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

15 years agoglsl: Fix handling of nested parens in macro actual arguments.
Michal Krol [Thu, 18 Dec 2008 17:45:32 +0000 (18:45 +0100)]
glsl: Fix handling of nested parens in macro actual arguments.

15 years agomesa: Pass the context to query object delete cb to avoid null dereference.
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.

15 years agogallium: Enable memory debugging on all windows platforms.
José Fonseca [Thu, 18 Dec 2008 14:53:24 +0000 (14:53 +0000)]
gallium: Enable memory debugging on all windows platforms.

15 years agomesa: choose GLSL vertex shader over ARB/internal vertex program in get_fp_input_mask()
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.

15 years agogallium: fix memory corruption in u_gen_mipmap.c
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.

15 years agomesa: fix fixed-function test in get_fp_input_mask() - again.
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.

15 years agomesa: add missing cases for texture array targets
Brian Paul [Wed, 17 Dec 2008 20:17:15 +0000 (13:17 -0700)]
mesa: add missing cases for texture array targets

15 years agoRevert "mesa: fix vertex program test in get_fp_input_mask()"
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.

15 years agomesa: fix vertex program test in get_fp_input_mask()
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.

15 years agowinsys: fix depth buffer size when using stencil
Brian Paul [Wed, 17 Dec 2008 17:55:29 +0000 (10:55 -0700)]
winsys: fix depth buffer size when using stencil

15 years agogallium: Fix PIPE_FORMAT_X8B8G8R8_SNORM definition.
Michal Krol [Mon, 15 Dec 2008 11:29:34 +0000 (12:29 +0100)]
gallium: Fix PIPE_FORMAT_X8B8G8R8_SNORM definition.

15 years agogallium: fix refcount bug introduced in eb20e2984
Keith Whitwell [Fri, 12 Dec 2008 18:34:49 +0000 (18:34 +0000)]
gallium: fix refcount bug introduced in eb20e2984

15 years agoMerge branch 'no-validate' into gallium-0.1
Keith Whitwell [Fri, 12 Dec 2008 17:41:49 +0000 (17:41 +0000)]
Merge branch 'no-validate' into gallium-0.1

15 years agogallium: avoid mapping same vertex buffer in subsequent frames
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.

15 years agost: reduce unnecessary calls to pipe->set_vertex_buffers()
Keith Whitwell [Wed, 10 Dec 2008 15:43:21 +0000 (15:43 +0000)]
st: reduce unnecessary calls to pipe->set_vertex_buffers()

15 years agost: move feedback draw function to new file
Keith Whitwell [Wed, 10 Dec 2008 15:42:28 +0000 (15:42 +0000)]
st: move feedback draw function to new file

15 years agost: don't unilaterally ABS the argument to RSQ
Keith Whitwell [Wed, 10 Dec 2008 15:41:48 +0000 (15:41 +0000)]
st: don't unilaterally ABS the argument to RSQ

15 years agoRevert "pipebuffer: Implement proper buffer validation."
Keith Whitwell [Fri, 12 Dec 2008 12:05:39 +0000 (12:05 +0000)]
Revert "pipebuffer: Implement proper buffer validation."

This reverts commit a6d866f72c88d48d2bcfb3e3c882fdb639b5a8ce.

15 years agoRevert "pipebuffer: Ondemand buffer manager."
Keith Whitwell [Fri, 12 Dec 2008 12:05:30 +0000 (12:05 +0000)]
Revert "pipebuffer: Ondemand buffer manager."

This reverts commit 17849eafaacfbb2124d86f561a91b707317d3b31.

15 years agoRevert "pipebuffer: Fix buffer overflow."
Keith Whitwell [Fri, 12 Dec 2008 12:05:21 +0000 (12:05 +0000)]
Revert "pipebuffer: Fix buffer overflow."

This reverts commit 55839ae064d64b7fcc180fcddb364bf31ab760dc.

15 years agoglut: MinGW portability fixes.
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...