mesa.git
16 years agoMerge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1
Ben Skeggs [Thu, 7 Aug 2008 01:19:15 +0000 (11:19 +1000)]
Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1

16 years agogallium: added PIPE_CAP_TEXTURE_MIRROR_CLAMP, PIPE_CAP_TEXTURE_MIRROR_REPEAT
Brian Paul [Wed, 6 Aug 2008 23:22:29 +0000 (17:22 -0600)]
gallium: added PIPE_CAP_TEXTURE_MIRROR_CLAMP, PIPE_CAP_TEXTURE_MIRROR_REPEAT

Check for these caps in state tracker and enable corresponding GL extensions
if supported.

16 years agosoftpipe: add texture border color code
Brian Paul [Wed, 6 Aug 2008 23:14:22 +0000 (17:14 -0600)]
softpipe: add texture border color code

16 years agoegl: define vsnprintf
Jonathan White [Wed, 6 Aug 2008 22:42:38 +0000 (16:42 -0600)]
egl: define vsnprintf

16 years agoegl: fixes for Windows
Jonathan White [Wed, 6 Aug 2008 22:37:49 +0000 (16:37 -0600)]
egl: fixes for Windows

16 years agomesa: glsl: regenerated file
Brian Paul [Wed, 6 Aug 2008 22:29:50 +0000 (16:29 -0600)]
mesa: glsl: regenerated file

16 years agomesa: glsl: report 'Syntax Error' instead of 'Invalid external declaration'
Brian Paul [Wed, 6 Aug 2008 22:29:40 +0000 (16:29 -0600)]
mesa: glsl: report 'Syntax Error' instead of 'Invalid external declaration'

16 years agomesa: glsl: additional error checking
Brian Paul [Wed, 6 Aug 2008 22:29:10 +0000 (16:29 -0600)]
mesa: glsl: additional error checking

16 years agomesa: glsl: fix a number of glUniform issues
Brian Paul [Wed, 6 Aug 2008 22:26:47 +0000 (16:26 -0600)]
mesa: glsl: fix a number of glUniform issues

Additional error checking.
Allow setting elements of uniform arrays.  This involves encoding both
a uniform location and a parameter offset in the value returned by
glGetUniformLocation().
Limit glUniform[if]v()'s count to the size of the uniform array.
When setting bool-valued uniforms, convert all float/int values to 0 or 1.

16 years agoegl: fix version handling
Jonathan White [Wed, 6 Aug 2008 19:40:03 +0000 (13:40 -0600)]
egl: fix version handling

16 years agomesa: glsl: fix glGetUniform for matrix queries
Brian Paul [Wed, 6 Aug 2008 19:07:09 +0000 (13:07 -0600)]
mesa: glsl: fix glGetUniform for matrix queries

16 years agomesa: glsl: fix error check in get_uniformfv()
Brian Paul [Wed, 6 Aug 2008 18:45:14 +0000 (12:45 -0600)]
mesa: glsl: fix error check in get_uniformfv()

16 years agomesa: glsl: check for rect tex samplers
Brian Paul [Wed, 6 Aug 2008 18:21:25 +0000 (12:21 -0600)]
mesa: glsl: check for rect tex samplers

16 years agomesa: glsl: disallow initializers for varying vars
Brian Paul [Wed, 6 Aug 2008 17:58:52 +0000 (11:58 -0600)]
mesa: glsl: disallow initializers for varying vars

16 years agomesa: glsl: more type checking for attribute/varying/uniform vars/locals
Brian Paul [Wed, 6 Aug 2008 17:45:42 +0000 (11:45 -0600)]
mesa: glsl: more type checking for attribute/varying/uniform vars/locals

16 years agomesa: glsl: check that attribute vars are of float/vec/mat type
Brian Paul [Wed, 6 Aug 2008 17:22:36 +0000 (11:22 -0600)]
mesa: glsl: check that attribute vars are of float/vec/mat type

16 years agomesa: glsl: more assignment type checking
Brian Paul [Wed, 6 Aug 2008 17:15:55 +0000 (11:15 -0600)]
mesa: glsl: more assignment type checking

Also that const declarations have initializers and that uniforms/samplers
can't have initializers.

16 years agomesa: glsl: fix SLANG_OPER_VARIABLE_DECL type checking case
Brian Paul [Wed, 6 Aug 2008 17:15:42 +0000 (11:15 -0600)]
mesa: glsl: fix SLANG_OPER_VARIABLE_DECL type checking case

16 years agomesa: glsl: count number of temp regs used
Haihao Xiang [Wed, 6 Aug 2008 15:05:09 +0000 (09:05 -0600)]
mesa: glsl: count number of temp regs used

16 years agofix some FBO/texture queries (bug 15296)
Brian Paul [Wed, 6 Aug 2008 14:39:54 +0000 (08:39 -0600)]
fix some FBO/texture queries (bug 15296)

16 years agomesa: glsl: code consolidation in _slang_gen_declaration()
Brian Paul [Wed, 6 Aug 2008 02:56:18 +0000 (20:56 -0600)]
mesa: glsl: code consolidation in _slang_gen_declaration()

16 years agomesa: glsl: disallow user-defined functions/vars prefixed with gl_
Brian Paul [Wed, 6 Aug 2008 02:28:14 +0000 (20:28 -0600)]
mesa: glsl: disallow user-defined functions/vars prefixed with gl_

16 years agomesa: glsl: additional type checking for assignments, inequalities
Brian Paul [Wed, 6 Aug 2008 02:12:50 +0000 (20:12 -0600)]
mesa: glsl: additional type checking for assignments, inequalities

16 years agomesa: glsl: generate error for main(any args)
Brian Paul [Wed, 6 Aug 2008 02:00:59 +0000 (20:00 -0600)]
mesa: glsl: generate error for main(any args)

16 years agoegl: changes for Windows
Jonathan White [Wed, 6 Aug 2008 01:22:09 +0000 (19:22 -0600)]
egl: changes for Windows

16 years agoegl: added snprintf, strcasecmp defines
Jonathan White [Wed, 6 Aug 2008 01:20:43 +0000 (19:20 -0600)]
egl: added snprintf, strcasecmp defines

16 years agomesa: glsl: regenerated file
Brian Paul [Tue, 5 Aug 2008 22:59:22 +0000 (16:59 -0600)]
mesa: glsl: regenerated file

16 years agomesa: glsl: remove invalid use of f.x syntax where f is a float
Brian Paul [Tue, 5 Aug 2008 22:58:44 +0000 (16:58 -0600)]
mesa: glsl: remove invalid use of f.x syntax where f is a float

16 years agomesa: glsl: re-enable assignment type checking
Brian Paul [Tue, 5 Aug 2008 22:58:31 +0000 (16:58 -0600)]
mesa: glsl: re-enable assignment type checking

16 years agomesa: glsl: regenerated files
Brian Paul [Tue, 5 Aug 2008 22:24:53 +0000 (16:24 -0600)]
mesa: glsl: regenerated files

16 years agomesa: glsl: re-org of intermediate/temp storage
Brian Paul [Tue, 5 Aug 2008 22:18:39 +0000 (16:18 -0600)]
mesa: glsl: re-org of intermediate/temp storage

Simplify the code for allocating storage for intermediate results.  Use fewer
temps in some cases.

Also, use new asm vec4_move intrinsic instead of regular assigments in various
constructors.  For example:
  float f;
  vec3 v;
  v.xyz = f;
is not legal GLSL, so do this instead:
  __asm vec4_move v.xyz, f;  // note: f will auto-expand into f.xxxx

Plus, fix assorted bugs in structure comparison.

16 years agomesa: glsl: disable broken assignment type checking for now
Brian Paul [Tue, 5 Aug 2008 17:13:51 +0000 (11:13 -0600)]
mesa: glsl: disable broken assignment type checking for now

16 years agoegl: don't include stdint.h on Windows
Jonathan White [Tue, 5 Aug 2008 14:13:50 +0000 (08:13 -0600)]
egl: don't include stdint.h on Windows

16 years agoegl: typedef uint8_t for Windows
Jonathan White [Tue, 5 Aug 2008 14:12:38 +0000 (08:12 -0600)]
egl: typedef uint8_t for Windows

16 years agomesa: glsl: check struct types in _slang_assignment_compatible()
Brian Paul [Mon, 4 Aug 2008 22:27:14 +0000 (16:27 -0600)]
mesa: glsl: check struct types in _slang_assignment_compatible()

16 years agomesa: glsl: varying vars can't be user-defined structs
Brian Paul [Mon, 4 Aug 2008 22:26:22 +0000 (16:26 -0600)]
mesa: glsl: varying vars can't be user-defined structs

16 years agomesa: glsl: regenerated files
Brian Paul [Mon, 4 Aug 2008 21:32:21 +0000 (15:32 -0600)]
mesa: glsl: regenerated files

16 years agomesa: glsl: added vec4(ivec4) constructor
Brian Paul [Mon, 4 Aug 2008 21:32:07 +0000 (15:32 -0600)]
mesa: glsl: added vec4(ivec4) constructor

16 years agomesa: glsl: if/while/do condition must be boolean
Brian Paul [Mon, 4 Aug 2008 21:30:32 +0000 (15:30 -0600)]
mesa: glsl: if/while/do condition must be boolean

16 years agomesa: glsl: additional type checking for ?: and = operators
Brian Paul [Mon, 4 Aug 2008 21:21:25 +0000 (15:21 -0600)]
mesa: glsl: additional type checking for ?: and = operators

16 years agomesa: glsl: don't allow comparision of arrays
Brian Paul [Mon, 4 Aug 2008 19:20:29 +0000 (13:20 -0600)]
mesa: glsl: don't allow comparision of arrays

16 years agomesa: glsl: error on const-qualified array declarations
Brian Paul [Mon, 4 Aug 2008 19:11:27 +0000 (13:11 -0600)]
mesa: glsl: error on const-qualified array declarations

16 years agomesa: glsl: added null ptr check
Brian Paul [Mon, 4 Aug 2008 19:07:05 +0000 (13:07 -0600)]
mesa: glsl: added null ptr check

16 years agomesa: glsl: set literal_size for const vars
Brian Paul [Mon, 4 Aug 2008 19:06:48 +0000 (13:06 -0600)]
mesa: glsl: set literal_size for const vars

16 years agomesa: glsl: add missing code emit for struct/field
Brian Paul [Mon, 4 Aug 2008 19:06:19 +0000 (13:06 -0600)]
mesa: glsl: add missing code emit for struct/field

16 years agomesa: glsl: stop code emit after error is recorded
Brian Paul [Mon, 4 Aug 2008 19:05:49 +0000 (13:05 -0600)]
mesa: glsl: stop code emit after error is recorded

16 years agomesa: glsl: check that rhs of const var initializer is also const
Brian Paul [Mon, 4 Aug 2008 17:14:12 +0000 (11:14 -0600)]
mesa: glsl: check that rhs of const var initializer is also const

16 years agomesa: glsl: handle user-defined const vars in expression simplification
Brian Paul [Mon, 4 Aug 2008 17:02:22 +0000 (11:02 -0600)]
mesa: glsl: handle user-defined const vars in expression simplification

16 years agomesa: glsl: fix initialize size error check
Brian Paul [Mon, 4 Aug 2008 16:58:13 +0000 (10:58 -0600)]
mesa: glsl: fix initialize size error check

16 years agomesa: glsl: added initializer size/type error checking
Brian Paul [Mon, 4 Aug 2008 16:21:55 +0000 (10:21 -0600)]
mesa: glsl: added initializer size/type error checking

16 years agomesa: glsl: only allow one #version directive
Brian Paul [Mon, 4 Aug 2008 16:07:26 +0000 (10:07 -0600)]
mesa: glsl: only allow one #version directive

16 years agomesa: glsl: regenerated file
Brian Paul [Mon, 4 Aug 2008 16:04:53 +0000 (10:04 -0600)]
mesa: glsl: regenerated file

16 years agomesa: glsl: new bvec4 constructor
Brian Paul [Mon, 4 Aug 2008 15:32:54 +0000 (09:32 -0600)]
mesa: glsl: new bvec4 constructor

16 years agoegl: typedef u_int32_t for Windows
Jonathan White [Mon, 4 Aug 2008 22:30:58 +0000 (16:30 -0600)]
egl: typedef u_int32_t for Windows

16 years agoegl: fix _eglGlobal initialization for Windows
Jonathan White [Mon, 4 Aug 2008 22:30:04 +0000 (16:30 -0600)]
egl: fix _eglGlobal initialization for Windows

16 years agotgsi: Put a newline after IMM.
Michal Krol [Mon, 4 Aug 2008 10:18:09 +0000 (12:18 +0200)]
tgsi: Put a newline after IMM.

16 years agog3dvl: Temporarily disable IDCT.
Younes Manton [Sun, 3 Aug 2008 22:21:13 +0000 (18:21 -0400)]
g3dvl: Temporarily disable IDCT.

16 years agonv40: Support for PIPE_FORMAT_R16_SNORM.
Younes Manton [Sun, 3 Aug 2008 21:20:48 +0000 (17:20 -0400)]
nv40: Support for PIPE_FORMAT_R16_SNORM.

16 years agoadded null ptr check (fix bug 16959)
Brian Paul [Sun, 3 Aug 2008 17:14:47 +0000 (11:14 -0600)]
added null ptr check (fix bug 16959)

16 years agosoftpipe: support PIPE_FORMAT_R16_SNORM.
Younes Manton [Sat, 2 Aug 2008 17:37:16 +0000 (19:37 +0200)]
softpipe: support PIPE_FORMAT_R16_SNORM.

16 years agog3dvl: Use R16_SNORM instead of A8L8_UNORM for block rendering.
Younes Manton [Wed, 30 Jul 2008 20:47:10 +0000 (16:47 -0400)]
g3dvl: Use R16_SNORM instead of A8L8_UNORM for block rendering.

16 years agomesa: glsl: remove old assertion (fixes glsl/bitmap.c)
Brian Paul [Tue, 29 Jul 2008 23:49:47 +0000 (17:49 -0600)]
mesa: glsl: remove old assertion (fixes glsl/bitmap.c)

16 years agomesa: disable debug code
Brian Paul [Tue, 29 Jul 2008 23:47:39 +0000 (17:47 -0600)]
mesa: disable debug code

16 years agotgsi: Insert newlines after the statements, instead of before.
José Fonseca [Tue, 29 Jul 2008 15:44:56 +0000 (00:44 +0900)]
tgsi: Insert newlines after the statements, instead of before.

Prevents shader dumps from getting concatenated with the next debug message.

16 years agoutil: Don't define replacement math functions for CE.
José Fonseca [Mon, 28 Jul 2008 13:42:18 +0000 (22:42 +0900)]
util: Don't define replacement math functions for CE.

It appears to be working without this before, and it is probably necessary.

16 years agoMerge tgsi/exec and tgsi/util directories.
José Fonseca [Mon, 28 Jul 2008 03:42:13 +0000 (12:42 +0900)]
Merge tgsi/exec and tgsi/util directories.

16 years agog3dvl: Recursively build dependencies.
Younes Manton [Sat, 26 Jul 2008 20:51:09 +0000 (16:51 -0400)]
g3dvl: Recursively build dependencies.

Run `make` in src/libXvMC and everything should be built for Nouveau.
Run `make DRIVER=softpipe` in src/libXvMC for SoftPipe.

16 years agoMerge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Ben Skeggs [Sat, 26 Jul 2008 14:54:57 +0000 (00:54 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

16 years agogallium: Windows miniport portability fixes.
José Fonseca [Sat, 26 Jul 2008 00:17:10 +0000 (09:17 +0900)]
gallium: Windows miniport portability fixes.

16 years agomesa: glsl: assorted fixes for resolving polymorphic functions
Brian Paul [Fri, 25 Jul 2008 21:33:02 +0000 (15:33 -0600)]
mesa: glsl: assorted fixes for resolving polymorphic functions

Plus,
- fix some issues in casting function arguments to format param types.
- fix some vec/mat constructor bugs
- find/report more syntax/semantic errors

16 years agomesa: regenerated files
Brian Paul [Fri, 25 Jul 2008 20:48:49 +0000 (14:48 -0600)]
mesa: regenerated files

16 years agomesa: glsl: re-order some constructors
Brian Paul [Fri, 25 Jul 2008 20:48:36 +0000 (14:48 -0600)]
mesa: glsl: re-order some constructors

16 years agomesa: glsl: remove unneeded operators
Brian Paul [Fri, 25 Jul 2008 20:48:14 +0000 (14:48 -0600)]
mesa: glsl: remove unneeded operators

16 years agomesa: fix issues causing warnings on Windows
Brian Paul [Fri, 25 Jul 2008 14:34:54 +0000 (08:34 -0600)]
mesa: fix issues causing warnings on Windows

16 years agomesa: glsl: additional error detection
Brian Paul [Thu, 24 Jul 2008 23:49:33 +0000 (17:49 -0600)]
mesa: glsl: additional error detection

Plus begin some fixes for vec/matrix constructors.

16 years agomesa: Mark as XXX unresolved warnings on windows.
Michal Krol [Fri, 25 Jul 2008 08:41:53 +0000 (10:41 +0200)]
mesa: Mark as XXX unresolved warnings on windows.

16 years agomesa: gls: fix broken else clause of conditional break/continue
Brian Paul [Thu, 24 Jul 2008 21:49:09 +0000 (15:49 -0600)]
mesa: gls: fix broken else clause of conditional break/continue

In the following case:

   for () {
      if (cond)
         break;  // or continue;
      else
         something;
   }

The "something" block didn't get emitted.

16 years agomesa: move extensions->version code into separate function
Brian Paul [Thu, 24 Jul 2008 21:12:42 +0000 (15:12 -0600)]
mesa: move extensions->version code into separate function

16 years agomesa: don't include Mesa version in GL_SHADING_LANGUAGE_VERSION string
Brian Paul [Thu, 24 Jul 2008 20:28:43 +0000 (14:28 -0600)]
mesa: don't include Mesa version in GL_SHADING_LANGUAGE_VERSION string

16 years agomesa: glsl: only try to link shaders defining main()
Brian Paul [Thu, 24 Jul 2008 20:56:54 +0000 (14:56 -0600)]
mesa: glsl: only try to link shaders defining main()

16 years agog3dvl: Added more XvMC stubs to get mplayer working.
Younes Manton [Thu, 24 Jul 2008 20:50:18 +0000 (16:50 -0400)]
g3dvl: Added more XvMC stubs to get mplayer working.

16 years agoscons: Lookup WINDDK and WINCE SDK directories in the registry.
José Fonseca [Thu, 24 Jul 2008 11:09:54 +0000 (20:09 +0900)]
scons: Lookup WINDDK and WINCE SDK directories in the registry.

16 years agomesa: Prefix main includes with dir to avoid conflicts.
José Fonseca [Wed, 23 Jul 2008 12:06:01 +0000 (21:06 +0900)]
mesa: Prefix main includes with dir to avoid conflicts.

Some of the headers in src/mesa/main have pretty common names which
easily conflict with third-party code, e.g. config.h

16 years agosoftpipe: Remove unused variables.
José Fonseca [Wed, 23 Jul 2008 02:15:54 +0000 (11:15 +0900)]
softpipe: Remove unused variables.

16 years agotgsi: Silent msvc warning.
José Fonseca [Tue, 22 Jul 2008 13:07:22 +0000 (22:07 +0900)]
tgsi: Silent msvc warning.

Rather stupid warning: msvc is warning that converting from a 1bit
structure bitfield to a unsigned char looses precision... /WX makes this
an error.

16 years agomesa: Silence compiler warning on windows.
Michal Krol [Thu, 24 Jul 2008 09:03:05 +0000 (11:03 +0200)]
mesa: Silence compiler warning on windows.

16 years agonv all: Copy shader tokens on create, free on delete.
Younes Manton [Thu, 24 Jul 2008 03:35:23 +0000 (23:35 -0400)]
nv all: Copy shader tokens on create, free on delete.

Must copy token stream on shader create, client is allowed to free
their copy after creating the state object.

16 years agogallium: bump TGSI_EXEC_NUM_TEMPS to 128
Brian Paul [Wed, 23 Jul 2008 22:28:15 +0000 (16:28 -0600)]
gallium: bump TGSI_EXEC_NUM_TEMPS to 128

16 years agomesa: glsl: fix/simplify built-in constant lookup
Brian Paul [Wed, 23 Jul 2008 21:14:22 +0000 (15:14 -0600)]
mesa: glsl: fix/simplify built-in constant lookup

16 years agomesa: glsl: fix/simplify array element handling
Brian Paul [Wed, 23 Jul 2008 21:04:25 +0000 (15:04 -0600)]
mesa: glsl: fix/simplify array element handling

Also fix bug in comparing large structs/arrays.

16 years agomesa: glsl: mark constructor params as const
Brian Paul [Wed, 23 Jul 2008 18:00:48 +0000 (12:00 -0600)]
mesa: glsl: mark constructor params as const

16 years agogallium: print extended swizzle negation flags
Brian Paul [Wed, 23 Jul 2008 15:56:44 +0000 (09:56 -0600)]
gallium: print extended swizzle negation flags

16 years agogallium: fix translation of extended swizzles, per-component negation
Brian Paul [Wed, 23 Jul 2008 15:56:20 +0000 (09:56 -0600)]
gallium: fix translation of extended swizzles, per-component negation

16 years agotgsi: Fix tgsi_util_get_full_src_register_extswizzle().
Michal Krol [Wed, 23 Jul 2008 15:52:56 +0000 (17:52 +0200)]
tgsi: Fix tgsi_util_get_full_src_register_extswizzle().

16 years agoi915: intel_flush_frontbuffer does work
Jakob Bornecrantz [Wed, 23 Jul 2008 12:02:33 +0000 (14:02 +0200)]
i915: intel_flush_frontbuffer does work

16 years agog3dvl: Minor fixes.
Younes Manton [Wed, 23 Jul 2008 06:28:02 +0000 (02:28 -0400)]
g3dvl: Minor fixes.

16 years agonouveau: is_format_supported() interface changes
Ben Skeggs [Wed, 23 Jul 2008 04:14:55 +0000 (14:14 +1000)]
nouveau: is_format_supported() interface changes

16 years agoMerge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Ben Skeggs [Wed, 23 Jul 2008 04:05:22 +0000 (14:05 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

16 years agog3dvl: Add Nouveau winsys, libdriclient.
Younes Manton [Wed, 23 Jul 2008 02:26:26 +0000 (22:26 -0400)]
g3dvl: Add Nouveau winsys, libdriclient.

Nouveau winsys is based on Mesa's Nouveau winsys and soft-links to most of
it. The 'nouveau_context' and 'nouveau_screen' code contains most of the
changes, 'nouveau_winsys_pipe', 'nouveau_swapbuffers' and 'nouveau_lock'
contain some minor changes. The driclient library contains the DRI
userland stuff, most of which was based on Mesa's DRI code.

16 years agog3dvl: Add stubs for some XvMC functions.
Younes Manton [Mon, 21 Jul 2008 01:30:14 +0000 (21:30 -0400)]
g3dvl: Add stubs for some XvMC functions.

Some of these may need to be implemented on the DDX side.