c727fa6dbf
Merge commit 'origin/gallium-draw-retval'
...
Conflicts:
src/gallium/drivers/identity/id_context.c
2010-01-05 14:13:40 +00:00
25024d9482
Merge branch 'mesa_7_7_branch'
...
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-31 09:02:27 -07:00
f31f9cf485
i915g: Silence unused variable warning.
2009-12-27 18:09:58 -08:00
d0b7ff551a
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
2009-12-27 15:31:08 -07:00
89d8577fb3
gallium: add geometry shader support to gallium
2009-12-25 05:52:16 -05:00
35e8283c69
Merge branch 'gallium-edgeflags'
...
Conflicts:
src/mesa/state_tracker/st_draw.c
2009-12-22 20:54:26 +01:00
03f212b0d8
gallium: propogate draw retval changes into more drivers
2009-12-21 22:55:40 +00:00
429f0e3b37
gallium: fix up drivers for edgeflag changes
...
several drivers which chose to ignore edgeflags might require some more work,
while edgeflags never worked there they might now crash.
2009-12-19 00:18:43 +01:00
b1ed72ebe2
Move the remaining format pf_get_* functions to u_format.h.
...
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
2009-12-17 23:41:57 +01:00
9c6a9363ef
Merge branch 'gallium-noblocks'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_exa.c
2009-12-04 00:35:14 +01:00
c78748a527
gallium: adapt drivers to interface cleanups
2009-12-02 02:08:26 +01:00
87eec80c11
Merge commit 'origin/tgsi-simplify-ext'
...
Conflicts:
src/gallium/drivers/r300/r300_vs.c
2009-12-01 14:31:14 +00:00
25bb04a1ee
i915: Update for renamed sampler/texture state setters.
2009-12-01 09:52:11 +01:00
c95cbd45c6
Merge branch 'width0'
...
Conflicts:
src/gallium/drivers/r300/r300_texture.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/mesa/state_tracker/st_cb_texture.c
2009-11-27 17:15:47 +01:00
91a4e6d53f
tgsi: rename fields of tgsi_full_src_register to reduce verbosity
...
SrcRegister -> Register
SrcRegisterInd -> Indirect
SrcRegisterDim -> Dimension
SrcRegisterDimInd -> DimIndirect
2009-11-24 15:13:17 +00:00
5b0824dfe5
tgsi: rename fields of tgsi_full_dst_register to reduce verbosity
...
DstRegister -> Register
DstRegisterInd -> Indirect
2009-11-24 15:08:55 +00:00
fe2b31e4a8
tgsi: rename fields of tgsi_full_declaration to reduce verbosity
...
DeclarationRange -> Range
2009-11-24 15:04:18 +00:00
7d6c8f980d
tgsi: rename fields of tgsi_full_instruction to avoid excessive verbosity
...
InstructionPredicate -> Predicate
InstructionLabel -> Label
InstructionTexture -> Texture
FullSrcRegisters -> Src
FullDstRegisters -> Dst
2009-11-24 15:02:23 +00:00
56ee132f96
gallium: try and update r300 and nv drivers for tgsi changes
...
It would be nice if these drivers built under the linux-debug header
so that these types of interface changes can be minimally propogated
into those drivers by people without the hardware. They don't have to
generate a working driver -- though a command-dumping winsys would be
an excellent for regression checking.
2009-11-24 14:09:24 +00:00
ba1ca28cc6
gallium: simplify tgsi tokens further
...
Drop anonymous 'Extended' fields, have every optional token named
explicitly in its parent. Eg. there is now an Instruction.Label flag,
etc.
Drop destination modifiers and other functionality which cannot be
generated by tgsi_ureg.c, which is now the primary way of creating
shaders.
Pull source modifiers into the source register token, drop the second
negate flag. The source register token is now full - if we need to
expand it, probably best to move all of the modifiers to a new token
and have a single flag for it.
2009-11-24 13:41:03 +00:00
f6541773c4
i915g: Add missing break statement in i915_debug.c.
2009-11-20 14:31:42 -08:00
683e35f726
gallium: don't use arrays for texture width,height,depth
2009-11-19 14:39:34 -08:00
7e3955d8e8
i915g: replace //-style comments
2009-11-17 16:16:30 -07:00
845ddbc9aa
i915g: remove trailing commas in enum lists to silence warnings
2009-11-17 16:16:30 -07:00
520b6abdec
i915g: Fix memory leak when pci id is unknown.
2009-11-10 12:39:42 -08:00
57d77c6a44
i915g: Fix comment in is buffer referenced
2009-11-07 19:31:18 +00:00
da253319f9
gallium: remove extended negate also, and also the ExtSwz token
...
Likewise, the extended negate functionality hasn't been
used since mesa switched to using tgsi_ureg to build programs,
and has been translating the SWZ opcode internally to a single MAD.
2009-10-23 14:50:02 +01:00
b9cb74c7f8
gallium: remove the swizzling parts of ExtSwizzle
...
These haven't been used by the mesa state tracker since the
conversion to tgsi_ureg, and it seems that none of the
other state trackers are using it either.
This helps simplify one of the biggest suprises when starting off with
TGSI shaders.
2009-10-23 14:31:24 +01:00
96c9b39a6a
i915g: Fix warnings
2009-10-14 23:05:55 +01:00
0083d2e40a
i915g: Fix MSVC build.
2009-10-07 14:29:23 -06:00
0f0127f6f9
i915g: Use buffer write instead of map for lit vertices
2009-10-07 14:04:48 +01:00
f8ba93aefd
i915g: Change order of buffer_write arguments
...
They now follow the pipe_buffer_write style,
its the gallium driver that sets the interface not
the winsys.
2009-10-07 13:48:32 +01:00
030723fc5d
i915g: Disable vbuf fifo and minor commenting of vbuf code
...
The vbuf fifo doesn't appear to help once the libdrm
reuse flag has been set.
2009-10-07 13:48:32 +01:00
ce3c2b51a2
i915g: Tweek vertexbuffer size
2009-10-06 03:09:01 +01:00
f00da2a3ff
i915g: Drop the simple sufix
...
None of the other driver have a silly sufix,
so just drop it. Nothing new added in this commit
or any other commit but this is better marketing.
2009-10-05 19:48:08 +01:00
Keith Whitwell