Keith Whitwell
19af2db064
gallium: remove files not in master
...
Remove git droppings we've accumulated somehow.
2008-09-21 11:49:05 -07:00
Keith Whitwell
a779f3b587
gallium: remove remnants of an nouveau driver
...
This isn't present on master, so probably shouldn't be here either.
2008-09-21 11:49:05 -07:00
Keith Whitwell
f9958a1ac6
swrast: remove merge droppings
2008-09-21 11:46:36 -07:00
Keith Whitwell
dd90d304f2
Merge branch 'master' into gallium-0.2
2008-09-21 11:01:22 -07:00
Keith Whitwell
45efcc44c7
Remove CVS keywords.
...
Cherry-picked from gallium-0.1
Conflicts:
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
2008-09-21 11:00:44 -07:00
Keith Whitwell
7513bc3886
Merge branch 'master' into gallium-0.2
2008-09-21 10:49:38 -07:00
José Fonseca
64dc397d8b
mesa: Prefix main includes with dir to avoid conflicts.
...
Eliminate a couple of differences with gallium-0.2
2008-09-21 10:48:40 -07:00
Keith Whitwell
f25a90ed22
Merge branch 'master' into gallium-0.2
2008-09-21 10:34:25 -07:00
Keith Whitwell
2ea3ef9a80
mesa: remove dead file
2008-09-21 10:34:04 -07:00
Keith Whitwell
c07e274f44
mesa: add explict float casts
2008-09-21 10:31:15 -07:00
Keith Whitwell
9644fa6c48
Merge branch 'master' into gallium-0.2
...
Conflicts:
include/GLES/egl.h
include/GLES/egltypes.h
src/egl/main/eglconfig.c
src/egl/main/eglconfig.h
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/Makefile
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
src/mesa/drivers/x11/xm_buffer.c
src/mesa/glapi/glapi.c
src/mesa/main/dispatch.c
src/mesa/main/state.c
src/mesa/main/texstate.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/arbprogram.c
src/mesa/shader/nvfragparse.c
src/mesa/shader/nvprogram.c
src/mesa/shader/shader_api.c
src/mesa/sources
src/mesa/swrast/s_aaline.c
src/mesa/swrast/s_aaline.h
src/mesa/swrast/s_aatriangle.h
src/mesa/swrast/s_accum.c
src/mesa/swrast/s_alpha.h
src/mesa/swrast/s_bitmap.c
src/mesa/swrast/s_blend.h
src/mesa/swrast/s_context.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_depth.c
src/mesa/swrast/s_depth.h
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_drawpix.h
src/mesa/swrast/s_feedback.c
src/mesa/swrast/s_feedback.h
src/mesa/swrast/s_fog.h
src/mesa/swrast/s_lines.h
src/mesa/swrast/s_logic.h
src/mesa/swrast/s_masking.h
src/mesa/swrast/s_points.c
src/mesa/swrast/s_points.h
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_span.h
src/mesa/swrast/s_stencil.h
src/mesa/swrast/s_texcombine.c
src/mesa/swrast/s_texcombine.h
src/mesa/swrast/s_texfilter.c
src/mesa/swrast/s_texfilter.h
src/mesa/swrast/s_texstore.c
src/mesa/swrast/s_triangle.c
src/mesa/swrast/s_triangle.h
src/mesa/swrast/s_zoom.h
src/mesa/swrast_setup/ss_context.c
src/mesa/swrast_setup/ss_triangle.h
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_vb_light.c
src/mesa/tnl/t_vertex_generic.c
src/mesa/tnl/t_vertex_sse.c
src/mesa/tnl/t_vp_build.h
src/mesa/tnl/tnl.h
src/mesa/x86/common_x86.c
2008-09-21 10:28:06 -07:00
Keith Whitwell
32ef6e7583
mesa: move fixed function vertex program builder from tnl to core mesa
...
Also unify caching of fragment and vertex programs in shader/prog_cache.c`
Brought across from gallium-0.2
2008-09-21 09:46:00 -07:00
Brian Paul
e019ead5d7
mesa: add parenthesis
...
(cherry picked from commit c366fd83b6
2008-09-21 09:45:41 -07:00
Keith Whitwell
5a46e17671
mesa: standardize on C99's uint*_t instead of u_int*_t
2008-09-21 09:45:00 -07:00
José Fonseca
3474e9de92
mesa: Remove assyntax.h include from generated matypes.h.
...
matypes.h doesn't really depend on assyntax.h; assyntax.h is only present
on x86; and this way we remove the need of grep being available (which is
relevant for scons and non-unix platforms).
(cherry picked from commit fc286ff3ba
2008-09-21 09:44:37 -07:00
Keith Whitwell
6b146214dc
mesa: move rastpos helper to tnl
2008-09-21 09:44:30 -07:00
Keith Whitwell
7ce597508e
mesa: improved driver query interface
...
Brought over from gallium-0.2 branch.
2008-09-21 09:44:25 -07:00
Patrice Mandin
da85a94d99
nouveau: init scaled_image_from_memory object for swizzled surface upload
2008-09-21 14:12:04 +02:00
Patrice Mandin
70071484d9
nouveau: add flag for swizzled surface upload
2008-09-21 14:02:30 +02:00
Brian Paul
99cdfc997b
cell: use different opcodes for spe_move() depending on even/odd address
2008-09-19 17:56:45 -06:00
Brian Paul
aca74a4d92
cell: make sure the fragment ops and fragment shader code buffer is at a 32-byte boundary
...
To make sure even/odd instructions hit the right pipes.
2008-09-19 17:56:45 -06:00
Brian Paul
bef3444f41
gallium: added ALIGN32_ATTRIB
2008-09-19 17:56:45 -06:00
Brian Paul
7af5f944e5
gallium: added spe_code_size()
2008-09-19 17:56:45 -06:00
Adam Jackson
dc8058c337
Update to SGI FreeB 2.0.
...
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
2008-09-19 17:16:53 -04:00
Jonathan White
33bef5866c
cell: Added FRC instruction
2008-09-19 15:10:25 -06:00
Jonathan White
1031638c2d
cell: Added FLR instruction. Verified the following instructions match softpipe: MOV, ADD, MUL, SGE, SUB, MAD, ABS, SLT, MIN, MAX, LRP, DP3, DP4, CMP, FLR
2008-09-19 14:18:39 -06:00
Jonathan White
e9c05c5b82
cell: Fixed bugs with DP3 and DP4, they match softpipe results now.
2008-09-19 13:00:28 -06:00
Brian Paul
7abf2358d7
cell: flesh out support for other Z/stencil format
...
Also: improve float/int Z conversion.
Use clgt instead of cgt in depth test since we're comparing unsigned values.
2008-09-19 12:52:41 -06:00
Michal Krol
8701e5f702
mesa: Fix compiler error.
2008-09-19 19:11:37 +02:00
Brian Paul
0500ae574f
cell: issue warning to stderr when using fallback fragment ops
2008-09-19 10:50:46 -06:00
Brian Paul
3c6bb15b7a
cell: fix a comment
2008-09-19 10:43:04 -06:00
Brian Paul
de0a6dc04a
cell: the test for CELL_DEBUG_FRAGMENT_OP_FALLBACK in cmd_state_fragment_ops() was inverted
2008-09-19 10:42:21 -06:00
Brian Paul
44d5e607c7
cell: disable XShmPutImage for tiled surface for now
...
Multiple displays of same surface data causes pixels to get scrambled.
2008-09-19 10:41:03 -06:00
Brian Paul
0838b70275
cell: change spe_complement() to take a src and dst reg, like other instructions
2008-09-19 09:36:29 -06:00
José Fonseca
d310c52c7f
Merge branch 'gallium-0.2' of ssh+git://git.freedesktop.org/git/mesa/mesa into gallium-0.2
2008-09-19 23:49:33 +09:00
José Fonseca
dda5c0c611
util: Use OpenGL rasterization rules in blits and mipmap generation.
2008-09-19 23:25:29 +09:00
Alan Hourihane
13e7e4b634
mesa: add missing FEATURE_attrib_stack around
...
call to _mesa_free_attrib_data()
2008-09-19 14:55:49 +01:00
Jakob Bornecrantz
89f47d1645
i915simple: Use defined MSAA array
2008-09-19 15:29:08 +02:00
Alan Hourihane
256592807c
bug fix to MSAA visuals
2008-09-19 14:19:38 +01:00
Alan Hourihane
d3172cddbf
fix for MSAA
2008-09-19 14:13:57 +01:00
Alan Hourihane
f7d80aa006
re-add MSAA support
2008-09-19 13:58:45 +01:00
Jakob Bornecrantz
82623bf2e5
i915simple: Front flushing does work
2008-09-19 14:46:24 +02:00
Jakob Bornecrantz
c6dc1bf6e0
i915simple: Fix extentions being loaded
2008-09-19 14:16:37 +02:00
Brian Paul
0576e837f1
mesa: Fix arb parse constants
2008-09-19 13:04:52 +02:00
Jakob Bornecrantz
866a2c3ccb
mesa: Update ignores a bit
2008-09-19 12:43:47 +02:00
Robert Ellison
a57fbe53dc
CELL: add codegen for logic op, color mask
...
- rtasm_ppc_spe.c, rtasm_ppc_spe.h: added a new macro function
"spe_load_uint" for loading and splatting unsigned integers
in a register; it will use "ila" for values 18 bits or less,
"ilh" for word values that are symmetric across halfwords,
"ilhu" for values that have zeroes in their bottom halfwords,
or "ilhu" followed by "iohl" for general 32-bit values.
Of the 15 color masks of interest, 4 are 18 bits or less,
2 are symmetric across halfwords, 3 are zero in the bottom
halfword, and 6 require two instructions to load.
- cell_gen_fragment.c: added full codegen for logic op and
color mask.
2008-09-19 01:55:00 -06:00
Brian
19d9c81b8c
glx: re-add glapi/ path
2008-09-18 21:22:08 -06:00
Brian
cfc4b4c989
mesa: remove unneeded s_drawpix.h header
2008-09-18 20:31:05 -06:00
Brian
4eb95ce807
glx: added "glapi/" prefix to include
2008-09-18 20:27:16 -06:00
José Fonseca
984a7c4e9c
gallium: Fix doxygen comments.
2008-09-19 10:40:42 +09:00
