OSDN Git Service
Younes Manton [Thu, 11 Dec 2008 22:55:16 +0000 (17:55 -0500)]
nouveau: Add busy() query, determines if BOs can be mapped immediately.
Younes Manton [Sat, 6 Dec 2008 20:45:00 +0000 (15:45 -0500)]
nouveau: Use PIPE_BUFFER_USAGE_CPU_* instead of custom.
Younes Manton [Fri, 5 Dec 2008 07:27:35 +0000 (02:27 -0500)]
g3dvl: Expand YCbCr to full RGB range by default.
Younes Manton [Fri, 5 Dec 2008 07:27:10 +0000 (02:27 -0500)]
g3dvl: Work around mplayer weirdness in XvMCPutSurface().
Younes Manton [Fri, 5 Dec 2008 07:26:47 +0000 (02:26 -0500)]
g3dvl: Flag textures holding incoming data as dynamic.
Younes Manton [Fri, 5 Dec 2008 07:26:07 +0000 (02:26 -0500)]
nouveau: Put dynamic textures in GART for CPU access and don't swizzle.
Also flag shadows as dynamic since they're for CPU access as well.
Younes Manton [Fri, 5 Dec 2008 07:22:56 +0000 (02:22 -0500)]
gallium: Define PIPE_TEXTURE_USAGE_DYNAMIC.
Knowing how the client intends to use the texture will give the
driver the opportunity to optimize for such cases.
Younes Manton [Fri, 5 Dec 2008 07:21:55 +0000 (02:21 -0500)]
nouveau: Swizzle textures larger than nv04 SIFM limit in parts.
Limit of SIFM on nv40 is 1024x1024, not sure about others.
José Fonseca [Fri, 9 Jan 2009 19:08:56 +0000 (19:08 +0000)]
draw: Add missing include.
Alan Hourihane [Fri, 9 Jan 2009 11:23:47 +0000 (11:23 +0000)]
st: build fix
Brian Paul [Fri, 9 Jan 2009 00:21:20 +0000 (17:21 -0700)]
mesa: 7.3-rc-1 Makefile changes
Brian Paul [Fri, 9 Jan 2009 00:20:41 +0000 (17:20 -0700)]
mesa: latest glxext.h header, no version change
Brian Paul [Fri, 9 Jan 2009 00:20:18 +0000 (17:20 -0700)]
mesa: import glext.h version 44
Brian Paul [Fri, 9 Jan 2009 00:19:51 +0000 (17:19 -0700)]
docs: dri2proto, libdrm tweaks
Brian Paul [Fri, 9 Jan 2009 00:07:28 +0000 (17:07 -0700)]
glsl: fix typo in the vec2 += operator function
Brian Paul [Thu, 8 Jan 2009 23:16:36 +0000 (16:16 -0700)]
mesa: set version string to 7.3-rc1
Brian Paul [Thu, 8 Jan 2009 23:14:19 +0000 (16:14 -0700)]
docs: more 7.3 doc updates
Brian Paul [Thu, 8 Jan 2009 23:12:23 +0000 (16:12 -0700)]
docs: import 7.2 relnotes, start on 7.3 relnotes
Brian Paul [Thu, 8 Jan 2009 22:32:02 +0000 (15:32 -0700)]
glsl: fix broken +=, -=, *=, /= operators
These functions need to return the final computed value.
Now expressions such as a = (b += c) work properly.
Also, no need to use __asm intrinsics in these functions. The resulting
code is the same when using ordinary arithmetic operators and is more legible.
Brian Paul [Wed, 7 Jan 2009 19:31:14 +0000 (12:31 -0700)]
mesa: fix off-by-one bug in _mesa_delete_instructions()
Eric Anholt [Thu, 8 Jan 2009 00:56:02 +0000 (16:56 -0800)]
i965: Fix GLSL FS DPH to return the right value instead of src0.w * src1.w.
Eric Anholt [Wed, 7 Jan 2009 22:26:11 +0000 (14:26 -0800)]
i965: Remove worrisome comment about _NEW_PROGRAM signaling fp change.
Everything now depends on either BRW_NEW_FRAGMENT_PROGRAM or
BRW_NEW_VERTEX_PROGRAM.
Eric Anholt [Wed, 7 Jan 2009 22:09:07 +0000 (14:09 -0800)]
mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.
There was a note in state.c about _Active deserving to die, and there were
potential issues with it due to i965 forgetting to set _UseTexEnvProgram.
Removing both simplifies things.
Reviewed-by: Brian Paul <brianp@vmware.com>
Eric Anholt [Wed, 7 Jan 2009 21:52:51 +0000 (13:52 -0800)]
i965: Remove dead brw_vs_tnl.c
Brian Paul [Thu, 8 Jan 2009 01:45:49 +0000 (18:45 -0700)]
i965: allow gl_FragData[0] usage when there's only one color buffer
If gl_FragData[0] is written but not gl_FragCOlor, use the former.
Brian Paul [Thu, 8 Jan 2009 01:44:41 +0000 (18:44 -0700)]
mesa: additional case in file_string()
Brian Paul [Thu, 8 Jan 2009 01:44:00 +0000 (18:44 -0700)]
glsl: pass GLcontext::Extension info down into GLSL preprocessor
Now the #extension directives can be handled properly.
Brian Paul [Thu, 8 Jan 2009 01:41:54 +0000 (18:41 -0700)]
glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY
Brian Paul [Thu, 8 Jan 2009 01:22:56 +0000 (18:22 -0700)]
glsl: check that the fragment shader does not write both gl_FragColor and gl_FragData[]
Brian Paul [Wed, 7 Jan 2009 22:06:06 +0000 (15:06 -0700)]
i965: init dst reg RelAddr field to zero
Eric Anholt [Wed, 7 Jan 2009 20:38:34 +0000 (12:38 -0800)]
i965: Note when we drop saturate mode on the floor in a VP.
Eric Anholt [Wed, 7 Jan 2009 20:37:58 +0000 (12:37 -0800)]
i965: Add support for LRP in VPs.
Bug #19226.
Brian Paul [Wed, 7 Jan 2009 15:56:10 +0000 (08:56 -0700)]
glsl: disable some unused functions (but don't remove just yet)
Brian Paul [Wed, 7 Jan 2009 15:54:09 +0000 (08:54 -0700)]
glsl: also unroll loops with variable declarations such as "for (int i = 0; ..."
Brian Paul [Wed, 7 Jan 2009 15:32:21 +0000 (08:32 -0700)]
glsl: remove dead code
Brian Paul [Wed, 7 Jan 2009 15:25:59 +0000 (08:25 -0700)]
mesa: OSMesa Makefile fixes (use LIB_DIR)
Brian Paul [Wed, 7 Jan 2009 00:36:20 +0000 (17:36 -0700)]
glsl: loop unroll adjustments
Add a "max complexity" heuristic to allow unrolling long loops with small
bodies and short loops with large bodies.
The loop unroll limits may need further tweaking...
Brian Paul [Wed, 7 Jan 2009 00:24:23 +0000 (17:24 -0700)]
glsl: implement loop unrolling for simple 'for' loops
Loops such as this will be unrolled:
for (i = 0; i < 4; ++i) {
body;
}
where 'body' isn't too large.
This also helps to fix the issue reported in bug #19190. The problem there
is indexing vector types with a variable index. For example:
vec4 v;
v[2] = 1.0; // equivalent to v.z = 1.0
v[i] = 2.0; // variable index into vector!!
Since the for-i loop can be unrolled, we can avoid the problems associated
with variable indexing into a vector (at least in this case).
Brian Paul [Tue, 6 Jan 2009 21:28:49 +0000 (14:28 -0700)]
mesa: Move var declaration to top of scope.
(cherry picked from commit
3740a06e28f4cd09e2a3dce2da60320aa9304df1)
José Fonseca [Thu, 8 Jan 2009 12:42:25 +0000 (12:42 +0000)]
glut: Unlist file.
Again..
José Fonseca [Thu, 8 Jan 2009 12:42:00 +0000 (12:42 +0000)]
gdi: Add newline at end of file.
José Fonseca [Thu, 8 Jan 2009 12:41:45 +0000 (12:41 +0000)]
gallium: Replace uint64 by standard uint64_t.
uint64 is not (so?) standard, and often redefined by third parties,
causing name clashes.
José Fonseca [Thu, 8 Jan 2009 12:31:36 +0000 (12:31 +0000)]
draw: Predeclare struct.
José Fonseca [Thu, 8 Jan 2009 12:31:14 +0000 (12:31 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/drivers/cell/spu/spu_command.h
src/gallium/include/pipe/p_shader_tokens.h
src/mesa/main/config.h
src/mesa/main/mtypes.h
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/slang_emit.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/wgl/stw_wgl.h
src/mesa/state_tracker/wgl/stw_wgl_pixelformat.h
José Fonseca [Wed, 7 Jan 2009 12:02:06 +0000 (12:02 +0000)]
mesa: Add _mesa_snprintf.
On Windows snprintf is renamed as _snprintf.
Brian Paul [Tue, 6 Jan 2009 21:21:27 +0000 (14:21 -0700)]
mesa: fix GL_DEPTH_CLEAR_VALUE casting
Brian Paul [Tue, 6 Jan 2009 21:18:45 +0000 (14:18 -0700)]
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
(cherry picked from commit
8124faf89d638285d8e9aa93adc3ca7f4ee729f3)
Conflicts:
src/mesa/main/get.c
José Fonseca [Tue, 6 Jan 2009 19:18:13 +0000 (19:18 +0000)]
mesa: Move var declaration to top of scope.
José Fonseca [Tue, 6 Jan 2009 16:45:12 +0000 (16:45 +0000)]
wgl: Do not provide DllMain inside the state tracker.
MS CRT libraries already provide a default DllMain entrypoint, and
MS Linker will complain if it finds the same symbol in two different
libraries. Therefore the DllMain has to be in (each) winsys.
José Fonseca [Tue, 6 Jan 2009 16:22:54 +0000 (16:22 +0000)]
gdi: Fix warning.
José Fonseca [Tue, 6 Jan 2009 16:21:47 +0000 (16:21 +0000)]
wgl: Ensure public symbols get the proper DLL linkage attributes.
José Fonseca [Tue, 6 Jan 2009 16:20:23 +0000 (16:20 +0000)]
glut: Fix build.
José Fonseca [Tue, 6 Jan 2009 16:20:12 +0000 (16:20 +0000)]
mesa: Ensure gl* symbols are marked as dllexport on windows.
José Fonseca [Tue, 6 Jan 2009 16:16:38 +0000 (16:16 +0000)]
scons: Choose the appropriate MSVC CRT.
José Fonseca [Tue, 6 Jan 2009 16:01:11 +0000 (16:01 +0000)]
mesa: Use explicit casts when precision is lost.
Silences MSVC.
José Fonseca [Thu, 8 Jan 2009 12:04:03 +0000 (12:04 +0000)]
mesa: Fix windows build when UNICODE is defined.
José Fonseca [Wed, 7 Jan 2009 12:02:06 +0000 (12:02 +0000)]
mesa: Add _mesa_snprintf.
On Windows snprintf is renamed as _snprintf.
Brian Paul [Tue, 6 Jan 2009 21:23:07 +0000 (14:23 -0700)]
add GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file
(cherry picked from commit
816fbeaa813e5cdca314a39677c74c8dc700d35a)
Conflicts:
src/mesa/main/get.c
Brian Paul [Tue, 6 Jan 2009 21:21:27 +0000 (14:21 -0700)]
mesa: fix GL_DEPTH_CLEAR_VALUE casting
Brian [Fri, 26 Sep 2008 01:57:34 +0000 (19:57 -0600)]
mesa: fix cast/conversion for optional code
(cherry picked from commit
1e3a44fab068f00378613456036716d0c3772969)
Brian Paul [Tue, 6 Jan 2009 21:18:45 +0000 (14:18 -0700)]
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
(cherry picked from commit
8124faf89d638285d8e9aa93adc3ca7f4ee729f3)
Conflicts:
src/mesa/main/get.c
Brian Paul [Tue, 6 Jan 2009 20:59:14 +0000 (13:59 -0700)]
mesa: pass ctx to link_uniform_vars() to fix build error
José Fonseca [Tue, 6 Jan 2009 19:18:13 +0000 (19:18 +0000)]
mesa: Move var declaration to top of scope.
José Fonseca [Tue, 6 Jan 2009 16:45:12 +0000 (16:45 +0000)]
wgl: Do not provide DllMain inside the state tracker.
MS CRT libraries already provide a default DllMain entrypoint, and
MS Linker will complain if it finds the same symbol in two different
libraries. Therefore the DllMain has to be in (each) winsys.
José Fonseca [Tue, 6 Jan 2009 16:22:54 +0000 (16:22 +0000)]
gdi: Fix warning.
José Fonseca [Tue, 6 Jan 2009 16:21:47 +0000 (16:21 +0000)]
wgl: Ensure public symbols get the proper DLL linkage attributes.
José Fonseca [Tue, 6 Jan 2009 16:20:23 +0000 (16:20 +0000)]
glut: Fix build.
José Fonseca [Tue, 6 Jan 2009 16:20:12 +0000 (16:20 +0000)]
mesa: Ensure gl* symbols are marked as dllexport on windows.
José Fonseca [Tue, 6 Jan 2009 16:16:38 +0000 (16:16 +0000)]
scons: Choose the appropriate MSVC CRT.
José Fonseca [Tue, 6 Jan 2009 16:01:11 +0000 (16:01 +0000)]
mesa: Use explicit casts when precision is lost.
Silences MSVC.
Brian Paul [Mon, 5 Jan 2009 20:12:12 +0000 (13:12 -0700)]
mesa: fix a GLSL swizzled writemask bug
This fixes cases such as:
vec4 v4;
vec2 v2;
v4.xz.yx = v2;
The last line now correctly compiles into MOV TEMP[1].xz, TEMP[0].yyxw;
Helps to fix the Humus Domino demo. See bug 19189.
(cherry picked from commit
9736d8f03364068c9ca786f88a4c2881d98d5768)
Brian Paul [Sat, 3 Jan 2009 00:30:08 +0000 (17:30 -0700)]
mesa: fix warning about possibly undefined var in GLSL compiler
(cherry picked from commit
724ed5b84bc2491da244d091de889d5b35503b5d)
Brian Paul [Tue, 6 Jan 2009 16:20:55 +0000 (09:20 -0700)]
mesa: fix another "out of samplers" problem
Now only the samplers that are actually used by texture() functions are
saved in the uniform variable list. Before, we could run out of samplers
if too many were declared while only some of them were actually used.
(cherry picked from commit
1fad6ccb756ae33ca3115f59c99ca8abbeb0321e)
Conflicts:
src/mesa/shader/slang/slang_link.c
Brian Paul [Thu, 1 Jan 2009 15:07:54 +0000 (08:07 -0700)]
mesa: updated comments about GLSL constants
(cherry picked from commit
dfada459aabf1a02dc2dbdb6644283fc95df2586)
Brian Paul [Wed, 31 Dec 2008 00:50:39 +0000 (17:50 -0700)]
mesa: fix bug in evaluation of structure fields
Fixes incorrect size information. See bug 19273.
(cherry picked from commit
e8d7db31e2a6784c765911233cb3d888f612837f)
Brian Paul [Wed, 31 Dec 2008 00:11:32 +0000 (17:11 -0700)]
mesa: allow variable indexing into the predefined uniform variable arrays
This allows code such as "vec4 a = gl_LightSource[i].ambient;" to work.
When a built-in uniform array is indexed with a variable index we need to
"unroll" the whole array into the parameter list (aka constant buffer) because
we don't know which elements may be accessed at compile-time. In the case of
the gl_LightSource array of size [8], we emit 64 state references into the
parameter array (8 elements times 8 vec4s per gl_LightSourceParameters
struct).
Previously, we only allowed constant-indexed references to uniform arrays
(such as gl_LightSource[2].position) which resulted in a single state reference
being added to the parameter array, not 64. We still optimize this case.
Users should be aware that using "gl_LightSource[i].ambient" in their shaders
is a bit expensive since state validation will involve updating all 64
light source entries in the parameter list.
(cherry picked from commit
c6537ac8b8130cf2271c8d1e51137a575073c762)
Brian Paul [Wed, 31 Dec 2008 00:03:09 +0000 (17:03 -0700)]
mesa: better error message when running out of GLSL samplers
(cherry picked from commit
ca0540e25c86b8095511868b0cbe96d7e85f7437)
Brian Paul [Tue, 16 Dec 2008 22:25:58 +0000 (15:25 -0700)]
mesa: disable debug output
(cherry picked from commit
3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753)
Brian Paul [Tue, 16 Dec 2008 21:29:52 +0000 (14:29 -0700)]
mesa: fix some GLSL array regressions
array.length() wasn't working.
Swizzle mask for accessing elements of float arrays was incorrect.
(cherry picked from commit
368df1615ef65afed96a44e1f43ade8cc703696f)
Brian Paul [Tue, 16 Dec 2008 01:30:40 +0000 (18:30 -0700)]
mesa: updated GLSL docs
(cherry picked from commit
c4341fe80acf75bf5417ffeb85fe6902218b752a)
Brian Paul [Tue, 16 Dec 2008 01:24:16 +0000 (18:24 -0700)]
mesa: bump glsl grammar revision
And update some copyrights.
(cherry picked from commit
4561307a27e07e37319fdf993c37f2c1b85ee3e9)
Brian Paul [Tue, 16 Dec 2008 01:18:08 +0000 (18:18 -0700)]
mesa: more re-org of variable declarations in glsl compiler
(cherry picked from commit
49543d7177fabc848822431891266e33bc13c818)
Brian Paul [Mon, 15 Dec 2008 23:57:37 +0000 (16:57 -0700)]
mesa: more comments, clean up
(cherry picked from commit
a1229cc9e7c78c59cad8d0df30b1f28d9bc81faf)
Brian Paul [Mon, 15 Dec 2008 23:49:32 +0000 (16:49 -0700)]
mesa: added comments, remove unused code
(cherry picked from commit
a66ff046cc169c6479b00b1e7fc5d87b93ad60ed)
Brian Paul [Mon, 15 Dec 2008 23:44:55 +0000 (16:44 -0700)]
mesa: checkpoint: handle uniform vars in _slang_gen_var_decl()
This allows uniform declarations with scalar/array initializers.
The code is rough though, and will be cleaned up.
(cherry picked from commit
aa1b90463676ea71f24c1956dcf51deec1bf664c)
Brian Paul [Sat, 13 Dec 2008 01:00:47 +0000 (18:00 -0700)]
mesa: place glsl constant arrays in constant memory
For example, a declaration like
const float[3] xxx = float[3](1.1, 2.2, 3.3);
will place the array in the constant buffer whereas a regular, non-const array
would be placed in the temporary register file.
Next up: do the same thing for uniform arrays.
Brian Paul [Sat, 13 Dec 2008 01:00:19 +0000 (18:00 -0700)]
mesa: remove old size=4 limit
(cherry picked from commit
0da44c62cc91c60d392f6e57aa047473b67ffb9b)
Brian Paul [Fri, 12 Dec 2008 23:20:31 +0000 (16:20 -0700)]
mesa: code clean-up in glsl compiler
(cherry picked from commit
d4be09fb2b4a2a45a95a388f536aee566e05f96a)
Brian Paul [Fri, 12 Dec 2008 23:02:31 +0000 (16:02 -0700)]
mesa: remove unneeded swizzle init code in glsl compiler
(cherry picked from commit
240e211c711b0ebfe6c3daa6cb70a3fa8fc8b656)
Brian Paul [Fri, 12 Dec 2008 22:34:58 +0000 (15:34 -0700)]
mesa: disable glsl debug output
(cherry picked from commit
4d49fc83f11ec2f333e06e94af5ac0d24b93caa8)
Brian Paul [Fri, 12 Dec 2008 22:11:08 +0000 (15:11 -0700)]
mesa: remove unused varpool code in glsl compiler
(cherry picked from commit
81253be3347312eb7539eb61ee9362f76370eba7)
Brian Paul [Fri, 12 Dec 2008 22:07:21 +0000 (15:07 -0700)]
mesa: basic array constructors work now
For example: float[3] xxx = float[3](1.1, 2.2, 3.3);
Optimizations for const-qualified arrays next.
(cherry picked from commit
5c0c5e5af9c72c170991f48628673faba85bc6f4)
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)
Brian Paul [Fri, 12 Dec 2008 22:00:06 +0000 (15:00 -0700)]
mesa: remove incorrect array_len assignment
(cherry picked from commit
9016331d0fd0783d1e46c9d4b651797d6af4a60f)
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)
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)
Brian Paul [Fri, 12 Dec 2008 17:32:56 +0000 (10:32 -0700)]
mesa: more glsl function renaming
(cherry picked from commit
d5367622a3f1cffe67af0fb6fca99ad02eefd374)
Brian Paul [Fri, 12 Dec 2008 17:29:15 +0000 (10:29 -0700)]
mesa: use _slang_alloc()
(cherry picked from commit
b4019483dea406e997ae1c6b61b41cc49786c8ce)
Brian Paul [Fri, 12 Dec 2008 17:22:47 +0000 (10:22 -0700)]
mesa: glsl compiler function renaming
(cherry picked from commit
456a4e274ff60122ab7e23dad2d462be3d910599)
Brian Paul [Fri, 12 Dec 2008 17:17:58 +0000 (10:17 -0700)]
mesa: more glsl type/function movement
(cherry picked from commit
9a174ef4090189e19831092bb2bae4bfc5396968)