OSDN Git Service
José Fonseca [Sun, 14 Feb 2010 11:26:58 +0000 (11:26 +0000)]
python: Pass p_format.h as-is to swig now that it has no inlines.
José Fonseca [Sun, 14 Feb 2010 11:15:19 +0000 (11:15 +0000)]
progs/gallium/python: New home for python statetracker scripts.
Vinson Lee [Sun, 14 Feb 2010 10:04:17 +0000 (02:04 -0800)]
glut: Silence uninitialized variable warning.
Vinson Lee [Sun, 14 Feb 2010 08:56:57 +0000 (00:56 -0800)]
r300: Silence uninitialized variable warning.
Vinson Lee [Sun, 14 Feb 2010 08:45:23 +0000 (00:45 -0800)]
r600: Silence uninitialized variable warning.
Vinson Lee [Sun, 14 Feb 2010 07:56:48 +0000 (23:56 -0800)]
glu/sgi: Initialize members of class Curvelist.
Vinson Lee [Sun, 14 Feb 2010 07:48:40 +0000 (23:48 -0800)]
llvmpipe: Silence uninitialized variable warning.
Vinson Lee [Sun, 14 Feb 2010 06:51:34 +0000 (22:51 -0800)]
softpipe: Silence uninitialized variable warnings.
Marek Olšák [Sun, 14 Feb 2010 02:16:00 +0000 (03:16 +0100)]
st/python: fix build error after gallium-screen-context merge
Marek Olšák [Sun, 14 Feb 2010 02:14:32 +0000 (03:14 +0100)]
r300g: fix scons build
Brian Paul [Sun, 14 Feb 2010 00:47:23 +0000 (17:47 -0700)]
softpipe: fix broken cubemap / mipmap selection code
This is a quick-fix for the time being...
The per-face mipmap LOD computation was invalid at cube edges. In
mip_filter_nearest/linear() we were trying to compute LOD using
texcoords that were sometimes indexes into different cube faces.
The subtraction used to compute the partial derivatives basically
gave random values, so the LOD was unpredictable. This fix simply
uses the same cube face for all four pixels in the quad. The per-
face texcoords all reference the same cube face so the partial
deriviates are computed properly.
A more elaborate fix would involve computing the LOD at the same
time as we choose the cube faces. But for now, this solution works
well and allows the piglit/cubemap test to pass.
(cherry picked from commit
1ff9cd5079b095d7050edb8dc6a7e5b8cad36e1e)
Karl Schultz [Sun, 14 Feb 2010 00:31:58 +0000 (17:31 -0700)]
mesa: Fix compiler warnings
Add explicit casts, fix constant types, fix variable types.
Fixes about 340 warnings in MSFT Visual Studio.
Brian Paul [Sat, 13 Feb 2010 21:06:25 +0000 (14:06 -0700)]
docs: document GL_ARB_fragment_coord_conventions
Brian Paul [Sat, 13 Feb 2010 21:02:54 +0000 (14:02 -0700)]
mesa: enable GL_ARB_fragment_coord_conventions for sw drivers
This extension is now implemented in the GLSL compiler so it can be
enabled by other drivers where applicable.
Brian Paul [Sat, 13 Feb 2010 20:57:31 +0000 (13:57 -0700)]
glsl: implement layout qualifiers
For GL_ARB_fragment_coord_conventions.
This only applies to gl_FragCoord and controls pixel center origin and
pixel center integer. For example:
layout (origin_upper_left, pixel_center_integer) varying vec4 gl_FragCoord;
This features introduces the idea of re-declaring variables with a changed
type. This may also apply to arrays in some cases but that's not
implemented at this time.
Brian Paul [Sat, 13 Feb 2010 20:52:37 +0000 (13:52 -0700)]
glsl: added type layout field and new type compare func
Note: because of a weird dependency checking bug, a 'make clean' may be
needed before recompiling.
Brian Paul [Sat, 13 Feb 2010 20:51:38 +0000 (13:51 -0700)]
mesa: copy frag coord layout fields too
Brian Paul [Sat, 13 Feb 2010 20:50:26 +0000 (13:50 -0700)]
glsl/cl: implement parsing for layout qualifiers
For GL_ARB_fragment_coord_conventions support.
Brian Paul [Sat, 13 Feb 2010 20:48:32 +0000 (13:48 -0700)]
glsl/pp: fix incorrect extension enable flag for warn mode
José Fonseca [Sat, 13 Feb 2010 15:10:24 +0000 (15:10 +0000)]
mesa: Export GL_EXT_texture_cube_map.
Still used by some applications.
José Fonseca [Sat, 13 Feb 2010 15:09:46 +0000 (15:09 +0000)]
wgl: Implement wglSwapMultipleBuffers.
José Fonseca [Sat, 13 Feb 2010 09:16:57 +0000 (09:16 +0000)]
svga: Fix texture border color.
Also opposite ordering.
Marek Olšák [Fri, 12 Feb 2010 04:03:27 +0000 (05:03 +0100)]
r300g: do not invalidate texture caches when only sampler state is changed
Marek Olšák [Fri, 12 Feb 2010 03:49:30 +0000 (04:49 +0100)]
r300g: cleanup the emission of RS block state
Emit as few regs as possible.
Marek Olšák [Fri, 12 Feb 2010 03:19:55 +0000 (04:19 +0100)]
r300g: cleanup the emission of framebuffer state
Some emits are not needed anymore.
Marek Olšák [Fri, 12 Feb 2010 03:01:15 +0000 (04:01 +0100)]
r300g: disable independent blend enables
Not supported by r300.
Marek Olšák [Fri, 12 Feb 2010 02:51:41 +0000 (03:51 +0100)]
r300g: emit INDEPENDENT_COLORFORMAT_ENABLE only on r5xx
Vinson Lee [Sat, 13 Feb 2010 08:05:29 +0000 (00:05 -0800)]
mesa: s/abort/sys.exit/
Python does not have the function abort.
Vinson Lee [Sat, 13 Feb 2010 07:47:45 +0000 (23:47 -0800)]
mesa: Remove unnecessary header.
Vinson Lee [Sat, 13 Feb 2010 07:37:36 +0000 (23:37 -0800)]
i965: Remove unnecessary headers.
Vinson Lee [Sat, 13 Feb 2010 07:24:22 +0000 (23:24 -0800)]
st/xlib: Remove unnecessary header.
Vinson Lee [Sat, 13 Feb 2010 07:18:08 +0000 (23:18 -0800)]
dri: Remove unnecessary headers.
Vinson Lee [Sat, 13 Feb 2010 07:04:20 +0000 (23:04 -0800)]
mesa: Remove unnecessary headers.
Vinson Lee [Sat, 13 Feb 2010 06:33:37 +0000 (22:33 -0800)]
svga: Silence uninitialized variable warning.
Corbin Simpson [Sat, 13 Feb 2010 04:43:20 +0000 (20:43 -0800)]
util: Properly init memory for blitter CSOs.
Fixes misrender on r300g.
Brian Paul [Sat, 13 Feb 2010 00:22:10 +0000 (17:22 -0700)]
st/mesa: restore draw rasterization stage after rasterpos
This fixes invalid calls to rastpos_point/line/tri() that can occur
when glRasterPos() is called while in feedback or selection mode.
(cherry picked from commit
b3c7dc6ff232eb4c5ff6b0ddcfa90bcb56f78df1)
José Fonseca [Fri, 12 Feb 2010 23:52:18 +0000 (23:52 +0000)]
scons: Undo bad merge from cherry-pick.
José Fonseca [Fri, 12 Feb 2010 23:17:04 +0000 (23:17 +0000)]
svga: A few more tweaks to blend color state emission.
José Fonseca [Fri, 12 Feb 2010 21:30:33 +0000 (21:30 +0000)]
svga: Clamp max cube texture levels to supported max 2d levels.
José Fonseca [Fri, 12 Feb 2010 17:01:48 +0000 (17:01 +0000)]
svga: Report the 2d/3d texture sizes supported by the host.
José Fonseca [Fri, 12 Feb 2010 13:59:16 +0000 (13:59 +0000)]
wgl: Go into dormant state when DLL is unloaded unclealy.
When our DLL is unloaded, even if we leave the data structures in memory
for sake of future calls, the MS CRT will destroy the heap. Instead we
make all calls no-ops by setting stw_dev to NULL.
José Fonseca [Fri, 12 Feb 2010 13:22:59 +0000 (13:22 +0000)]
scons: Target Windows7.
Brian Paul [Fri, 12 Feb 2010 22:40:57 +0000 (15:40 -0700)]
st/mesa: improved draw_range_elements code
Don't use pipe->draw_range_elements() if min_index=max_index=~0 since
that doesn't provide any useful info.
Also, implement the loop around pipe->draw_range_elements() when
nr_prims > 1.
Brian Paul [Fri, 12 Feb 2010 21:46:51 +0000 (14:46 -0700)]
st/mesa: rename state -> tgsi, updated comments
Brian Paul [Fri, 12 Feb 2010 21:46:10 +0000 (14:46 -0700)]
st/mesa: remove unused var
Vinson Lee [Fri, 12 Feb 2010 22:36:11 +0000 (14:36 -0800)]
intel: Remove unused variable.
Brian Paul [Fri, 12 Feb 2010 22:24:54 +0000 (15:24 -0700)]
cell: fix-up C, CPP flags
Flags like -Wmissing-prototypes don't apply to g++.
Brian Paul [Fri, 12 Feb 2010 22:24:24 +0000 (15:24 -0700)]
cell: implement PIPE_CAP_MAX_COMBINED_SAMPLERS query
Brian Paul [Fri, 12 Feb 2010 19:35:18 +0000 (12:35 -0700)]
cell: remove -mcpu=cell from CFLAGS
This reverts part of commit
ebe2f7609533645e7e9c8af4a55bc0127b9bc515
and allows things to build here.
Kristian Høgsberg [Thu, 11 Feb 2010 22:19:34 +0000 (17:19 -0500)]
intel: Avoid dri_bo_flink() in intel_update_renderbuffers()
Now that we track the global name in struct intel_region, we can just
look it up there.
Kristian Høgsberg [Thu, 11 Feb 2010 22:18:01 +0000 (17:18 -0500)]
intel: Track named regions and make sure we only have one region per named bo
Kristian Høgsberg [Thu, 11 Feb 2010 22:10:19 +0000 (17:10 -0500)]
dri: Store the loader private passed in at dri context creation
We just threw it away before, but we haven't had a use for it yet.
Zack Rusin [Thu, 11 Feb 2010 03:15:24 +0000 (22:15 -0500)]
st/dri: don't expose visuals we'll have trouble supporting
without getBuffersWithFormat some visuals will just cause headaches (crashes),
so if we're running on an older system simply don't advertise them.
Zack Rusin [Thu, 11 Feb 2010 00:00:35 +0000 (19:00 -0500)]
st/dri, st/xorg: fix buffers that have attachements of different depth
we actually need to specify the formats for different attachements, otherwise
if the color buffer is 24bpp and the app asks for 16bpp depth buffer than
we end up fetching the depth from the drawable which is 24bpp and end up
creating the wrong depth buffer. use the new getBuffersWithFormat extension
to pass the depth correctly.
Roland Scheidegger [Fri, 12 Feb 2010 20:43:45 +0000 (21:43 +0100)]
svga: enable code to emit blend color
Roland Scheidegger [Fri, 12 Feb 2010 20:39:29 +0000 (21:39 +0100)]
Merge branch 'gallium-dynamicstencilref'
Vinson Lee [Fri, 12 Feb 2010 19:59:37 +0000 (11:59 -0800)]
progs/tests: Add checks for GL_NV_vertex_program.
Jerome Glisse [Fri, 12 Feb 2010 18:25:16 +0000 (19:25 +0100)]
Revert "r600c: substract vbo offset to vbo size"
This reverts commit
325614a882f5371da512536e07c443a172ffb87c.
Ok this was already fixed this commit actualy broke things
Patrice Mandin [Fri, 12 Feb 2010 18:22:41 +0000 (19:22 +0100)]
nouveau: nv30: it may have 8 texture samplers (not 4), but shader engine has 16 texture units
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
Brian Paul [Fri, 12 Feb 2010 18:07:01 +0000 (11:07 -0700)]
cell: adjust structure padding
The size of some core Gallium state structures has changed so the
padding on some cell structs needed to be adjusted to keep them
a multiple of 16 bytes.
Brian Paul [Fri, 12 Feb 2010 18:06:19 +0000 (11:06 -0700)]
cell: remove unused var
Brian Paul [Fri, 12 Feb 2010 18:06:04 +0000 (11:06 -0700)]
cell: include cell_context.h
Brian Paul [Fri, 12 Feb 2010 16:47:34 +0000 (09:47 -0700)]
cell: re-fix undeclared var
Brian Paul [Fri, 12 Feb 2010 16:43:18 +0000 (09:43 -0700)]
cell: declare stencil_value variable
Jerome Glisse [Fri, 12 Feb 2010 16:06:19 +0000 (17:06 +0100)]
r600c: substract vbo offset to vbo size
To avoid kernel complaining and to set proper boundary on
vbo, substract the vbo offset to the vbo size.
Andre Maasikas [Fri, 12 Feb 2010 14:20:50 +0000 (16:20 +0200)]
r600: be more exact in vb size calculation
to make kernel cs checker happier, last attribs don't need full stride of
space. Calculate as count-1*stride + size of attrib
Andre Maasikas [Fri, 12 Feb 2010 14:16:56 +0000 (16:16 +0200)]
r600: support GL_SHORT attributes
normalized seems to work with this setting.
Michal Krol [Fri, 12 Feb 2010 13:45:51 +0000 (14:45 +0100)]
Revert "util: Fix descriptors for R32_FLOAT and R32G32_FLOAT formats."
This reverts commit
aa0b671422880b99dc178d43d1e4e1a3f766bf7f.
Michal Krol [Fri, 12 Feb 2010 12:32:35 +0000 (13:32 +0100)]
util: Fix descriptors for R32_FLOAT and R32G32_FLOAT formats.
Fill in ones for missing components.
Patrice Mandin [Fri, 12 Feb 2010 12:23:48 +0000 (13:23 +0100)]
nouveau: nv30: Define number of texture samplers
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
José Fonseca [Fri, 12 Feb 2010 11:00:22 +0000 (11:00 +0000)]
wgl: Do not reach out and destroy contexts on cleanup.
Simply skip cleanup when contexts are still active.
This addresses two issues:
- in some situations the ICD DLL may be unloaded before the DLL that is
using GL contexts is, so we may receive GL calls after stw_cleanup.
- when aborting (exception, or control-c) the contexts may have been left
in an inconsistent state and attempting to destroy can cause
unpredictable results.
José Fonseca [Thu, 11 Feb 2010 16:34:43 +0000 (16:34 +0000)]
gdi: Never fail at DLL load time.
Windows doesn't really expect things to fail at this point -- it
will try many times until it finally gives up, worse, something bad
happens.
The WGL state tracker will gracefully decline to do work even when it
is loaded.
José Fonseca [Thu, 11 Feb 2010 16:32:23 +0000 (16:32 +0000)]
wgl: Fail gracefully whenever 3D could not be enabled for some reason.
José Fonseca [Thu, 11 Feb 2010 14:09:53 +0000 (14:09 +0000)]
svgadump: Several improvements to shader dumping.
Vinson Lee [Fri, 12 Feb 2010 08:41:01 +0000 (00:41 -0800)]
glu/sgi: Initialize member of class primStream.
Vinson Lee [Fri, 12 Feb 2010 08:36:00 +0000 (00:36 -0800)]
glu/sgi: Initialize members of class Arc.
Vinson Lee [Fri, 12 Feb 2010 08:28:44 +0000 (00:28 -0800)]
glu/sgi: Initialize member of class Bin.
Ben Skeggs [Fri, 12 Feb 2010 05:34:33 +0000 (15:34 +1000)]
nouveau: use AVAIL_RING()
Ben Skeggs [Fri, 12 Feb 2010 02:50:24 +0000 (12:50 +1000)]
nouveau: switch to nouveau_bo_new_tile()
Brian Paul [Thu, 11 Feb 2010 23:54:48 +0000 (16:54 -0700)]
svga: check min_index, max_index before assertions
It's possible for min_index and max_index to be ~0 if the min/max
values were not actually set or computed in the state tracker.
Skip some assertions in that case.
This only effects the debug build error checking.
(cherry picked from commit
408f32dc165b36eb5ec0e2bbc7dcecd28f3a62d3)
Karl Schultz [Thu, 11 Feb 2010 23:49:41 +0000 (16:49 -0700)]
main: Fix compiler warning. No need to convert/store depthScale as GLfloat just to convert it back to GLuint to call unpack_depth_span.
Also removes a difference between the 24/8 and 8/24 texstore routines.
Roland Scheidegger [Thu, 11 Feb 2010 23:43:38 +0000 (00:43 +0100)]
gallium: make max_anisotropy a unsigned bitfield member
saves us a dword in sampler state, hw can't do non-integer aniso degree anyway.
To allow aniso 1x (which seems of dubious value but some hardware (radeons)
have such a mode, and even d3d allows specifiying it) redefine anisotropic
filtering as disabled only if max_anistropy is 0.
Karl Schultz [Thu, 11 Feb 2010 22:52:22 +0000 (15:52 -0700)]
Turn off 64-bit portability problems detection.
Roland Scheidegger [Thu, 11 Feb 2010 22:11:03 +0000 (23:11 +0100)]
nouveau: fix compile errors...
Kristian Høgsberg [Thu, 11 Feb 2010 22:04:06 +0000 (17:04 -0500)]
glapi: Avoid #including gl.h
It's only used for a couple of integer types and and might conflict
with other client API header files.
Kristian Høgsberg [Thu, 11 Feb 2010 21:50:46 +0000 (16:50 -0500)]
i915: Remove always-true irq_active struct intel_screen field
Kristian Høgsberg [Thu, 11 Feb 2010 21:47:46 +0000 (16:47 -0500)]
i915: Remove a few DRI1 era struct intel_screen fields
Kristian Høgsberg [Thu, 11 Feb 2010 21:44:21 +0000 (16:44 -0500)]
i915: Drop intelScreenPrivate typedef and just call it struct intel_screen
Kristian Høgsberg [Thu, 11 Feb 2010 21:38:23 +0000 (16:38 -0500)]
i915: Remove unused intelRegion struct
Phew, sure is nice to only have one struct called intel region.
Roland Scheidegger [Thu, 11 Feb 2010 21:48:39 +0000 (22:48 +0100)]
nv50: adapt to stencil ref changes
Roland Scheidegger [Thu, 11 Feb 2010 21:48:31 +0000 (22:48 +0100)]
nv40: adapt to stencil ref changes
Kristian Høgsberg [Thu, 11 Feb 2010 21:34:11 +0000 (16:34 -0500)]
i915: Remove left-over drmUnmap()
Roland Scheidegger [Thu, 11 Feb 2010 19:55:33 +0000 (20:55 +0100)]
nv30: adapt to stencil ref changes
not sure if this has any hope of working
Brian Paul [Thu, 11 Feb 2010 18:34:28 +0000 (11:34 -0700)]
mesa: additional constant/limit assertions
Brian Paul [Thu, 11 Feb 2010 18:33:17 +0000 (11:33 -0700)]
svga: implement PIPE_CAP_MAX_COMBINED_SAMPLERS query
Roland Scheidegger [Thu, 11 Feb 2010 18:01:10 +0000 (19:01 +0100)]
gallium: make u_blitter code save/restore stencil ref values
Karl Schultz [Thu, 11 Feb 2010 17:54:18 +0000 (10:54 -0700)]
Add git tips
Roland Scheidegger [Thu, 11 Feb 2010 17:48:57 +0000 (18:48 +0100)]
r300g: adapt to stencil ref changes
Roland Scheidegger [Thu, 11 Feb 2010 17:18:11 +0000 (18:18 +0100)]
cell: adapt to stencil ref changes
not betting this compiles, some of the code handling stencil test seems
incomplete and/or never called?
Roland Scheidegger [Thu, 11 Feb 2010 17:16:52 +0000 (18:16 +0100)]
i965g: adapt to stencil ref changes
while there also potentially fix logic ops (were never enabled before)