Jakob Bornecrantz [Mon, 28 Jun 2010 19:37:03 +0000 (21:37 +0200)]
glhd: Remove leftover file
Jakob Bornecrantz [Mon, 28 Jun 2010 18:59:09 +0000 (20:59 +0200)]
Merge branch 'gallium-drm-driver-drescriptor'
Conflicts:
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/radeon/drm/radeon_drm.c
José Fonseca [Mon, 28 Jun 2010 15:33:52 +0000 (16:33 +0100)]
llvmpipe: set WRITE_ALL only a per-tile basis in lp_resource_copy().
José Fonseca [Mon, 28 Jun 2010 14:39:54 +0000 (15:39 +0100)]
llvmpipe: Actually flush in lp_resource_copy()
The cpu_access is redundant in a software rasterizer.
José Fonseca [Mon, 28 Jun 2010 15:28:55 +0000 (16:28 +0100)]
llvmpipe: Ensure outdated framebuffer state is not reused in lp_setup_bind_framebuffer().
We were starting a scene whenever lp_setup_get_vertex_info() was called by
the draw module. So when when all primitives were culled/clipped, not only
did we create a new scene for nothing, but we end up using the old scene
with the old framebuffer state instead of a new one.
Fix consists in:
- don't call lp_setup_update_state() in lp_setup_get_vertex_info() -- no
longer necessary
- always setting the scene state before binning a command -- query
commands were bypassing it
- assert no old scene is reused in lp_setup_bind_framebuffer()
Marek Olšák [Sun, 27 Jun 2010 15:15:23 +0000 (17:15 +0200)]
r300g: fix a compile error on non-debug builds
Marek Olšák [Sun, 27 Jun 2010 13:02:08 +0000 (15:02 +0200)]
util: fix a memory leak in blitter
Marek Olšák [Sun, 27 Jun 2010 11:55:59 +0000 (13:55 +0200)]
r300g: separate the hyperz state and pipelined FB regs out of the FB state
Marek Olšák [Sat, 26 Jun 2010 23:07:34 +0000 (01:07 +0200)]
r300g: release referenced objects in destroy_context
Marek Olšák [Sat, 26 Jun 2010 22:39:27 +0000 (00:39 +0200)]
r300g: reference surfaces in set_framebuffer_state
Marek Olšák [Sat, 26 Jun 2010 17:09:19 +0000 (19:09 +0200)]
r300g: group debug messages
Marek Olšák [Fri, 25 Jun 2010 02:48:02 +0000 (04:48 +0200)]
r300g: turn rasterizer state into a command buffer
Marek Olšák [Fri, 25 Jun 2010 01:28:09 +0000 (03:28 +0200)]
r300g: move emission of the MSPOS regs into the framebuffer state
Now the question is whether we are allowed to ignore gl_rasterization_rules and
pipe_rasterizer_state::multisample. The former is invariant anyway and
I think the latter would need re-emitting the AA state which is quite costly,
considering that it implicitly flushes the whole pipeline (all AA regs
in the AA state are *unpipelined*).
Marek Olšák [Fri, 25 Jun 2010 00:55:14 +0000 (02:55 +0200)]
r300g: turn invariant state into a command buffer
Marek Olšák [Fri, 25 Jun 2010 00:37:06 +0000 (02:37 +0200)]
r300g: initialize some crucial state in the first CS
Marek Olšák [Fri, 25 Jun 2010 00:16:43 +0000 (02:16 +0200)]
r300g: introduce VAP invariant state
Unlike other invariant states, this one must be emitted after VAP flush.
Marek Olšák [Tue, 22 Jun 2010 05:54:21 +0000 (07:54 +0200)]
r300g: immediate mode cleanup
Marek Olšák [Sat, 26 Jun 2010 15:41:42 +0000 (17:41 +0200)]
r300g: update my notes about fastfill and zbuffer compression
Marek Olšák [Sat, 26 Jun 2010 15:35:56 +0000 (17:35 +0200)]
r300g: enum r300_blitter_op is a bitmask
Marek Olšák [Sat, 26 Jun 2010 12:00:24 +0000 (14:00 +0200)]
draw: fix build with llvm and make
Vinson Lee [Sat, 26 Jun 2010 07:47:52 +0000 (00:47 -0700)]
mesa: Remove unnecessary header.
Vinson Lee [Sat, 26 Jun 2010 07:38:05 +0000 (00:38 -0700)]
st/mesa: Remove unnecessary headers.
Vinson Lee [Sat, 26 Jun 2010 07:31:57 +0000 (00:31 -0700)]
draw: Remove unnecessary header.
Zack Rusin [Sat, 26 Jun 2010 00:06:53 +0000 (20:06 -0400)]
draw: deleted by mistake
Zack Rusin [Fri, 25 Jun 2010 23:58:09 +0000 (19:58 -0400)]
draw: initialize headers in the none post paths as well
Zack Rusin [Fri, 25 Jun 2010 23:31:09 +0000 (19:31 -0400)]
draw: limit the number of vertex shader variants kept around
we used to create and cache unltimited number of variant, this
change limits the number of variants kept around to a fixed number.
the change is based on a similar patch by Roland for llvmpipe fragment
shaders.
Zack Rusin [Wed, 23 Jun 2010 22:13:25 +0000 (18:13 -0400)]
draw: initialize vertex header
Brian Paul [Fri, 25 Jun 2010 20:12:30 +0000 (14:12 -0600)]
gallium/util: fix pipe_sampler_view_reference() calls
The conditionals aren't needed.
Brian Paul [Fri, 25 Jun 2010 15:39:43 +0000 (09:39 -0600)]
softpipe: rename a var
Chia-I Wu [Fri, 25 Jun 2010 10:32:41 +0000 (18:32 +0800)]
draw: Work around an invalid write.
SSE vertex shader does not seem to honor the execution mask. Pad the
output array as a workaround.
Brian Paul [Thu, 24 Jun 2010 20:10:24 +0000 (14:10 -0600)]
mesa: initialize extension string when context is first bound
...instead of waiting until glGetString(GL_EXTENSIONS) is called.
This fixes a problem where the MESA_EXTENSION_OVERRIDE env var is
ignored if the app never calls glGetString(GL_EXTENSIONS).
NOTE: this is a candidate patch for the 7.8 branch.
Brian Paul [Thu, 24 Jun 2010 18:45:29 +0000 (12:45 -0600)]
llvmpipe: fix comment typo
Brian Paul [Thu, 24 Jun 2010 18:45:14 +0000 (12:45 -0600)]
softpipe: fix comment typo
Marek Olšák [Thu, 24 Jun 2010 20:19:44 +0000 (22:19 +0200)]
r300g: a couple more chipsets do not have HiZ RAM
Corbin Simpson [Thu, 24 Jun 2010 14:54:00 +0000 (07:54 -0700)]
gallium/docs: Vertex data formats.
I'm not sure if I really got it right. This seems like one of those
"Duh, of course it works that way" things, but I'd like the
documentation to be readable by people not acquainted with OGL/D3D.
Corbin Simpson [Thu, 24 Jun 2010 14:18:59 +0000 (07:18 -0700)]
glhd: Add test for logicop enable.
Only for first RT at the moment, as there is no trivial way in galahad
to look at framebuffer state and (sadly) people don't usually calloc
their CSOs, so flags could be wrongly set.
On the other hand, of course, galahad will hopefully encourage more
people to calloc their CSOs. :3
Corbin Simpson [Thu, 24 Jun 2010 14:13:10 +0000 (07:13 -0700)]
gallium/docs: Lops override the rest of the blending state when enabled.
Brian Paul [Thu, 24 Jun 2010 13:21:15 +0000 (07:21 -0600)]
gallium/docs: updated remaining semantic label docs
nobled [Thu, 24 Jun 2010 01:31:28 +0000 (21:31 -0400)]
pipe: Add PIPE_OS_HURD
One tiny step toward porting Gallium to the GNU/Hurd kernel
(and fixing Debian bug #585618).
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Corbin Simpson [Wed, 23 Jun 2010 21:25:26 +0000 (14:25 -0700)]
gallium/docs: Add lop table.
Was feeling kind of weird without it.
Corbin Simpson [Wed, 23 Jun 2010 20:57:30 +0000 (13:57 -0700)]
gallium/docs: Slight clarification and formatting for Blend.
Brian Paul [Thu, 24 Jun 2010 04:30:26 +0000 (22:30 -0600)]
Merge branch 'shader-file-reorg'
1. Move all GL entrypoint functions and files into src/mesa/main/
This includes the ARB vp/vp, NV vp/fp, ATI fragshader and GLSL bits
that were in src/mesa/shader/
2. Move src/mesa/shader/slang/ to src/mesa/slang/ to reduce the tree depth
3. Rename src/mesa/shader/ to src/mesa/program/ since all the
remaining files are concerned with GPU programs.
4. Misc code refactoring. In particular, I got rid of most of the
GLSL-related ctx->Driver hook functions. None of the drivers used
them.
Conflicts:
src/mesa/drivers/dri/i965/brw_context.c
Marek Olšák [Thu, 24 Jun 2010 04:15:36 +0000 (06:15 +0200)]
r300g: remove an XXX comment
Marek Olšák [Thu, 24 Jun 2010 03:54:18 +0000 (05:54 +0200)]
r300g: move AA registers into the new AA state
Marek Olšák [Thu, 24 Jun 2010 02:43:40 +0000 (04:43 +0200)]
r300g: separate the cache flush from the framebuffer state
Marek Olšák [Thu, 24 Jun 2010 01:52:45 +0000 (03:52 +0200)]
r300g: reorder and cleanup register writes everywhere
Marek Olšák [Thu, 24 Jun 2010 01:02:50 +0000 (03:02 +0200)]
r300g: add "has HiZ" flag, add ZMask regs
Jakob Bornecrantz [Thu, 24 Jun 2010 00:36:30 +0000 (02:36 +0200)]
nouveau: Remove reference to drm_api
Jakob Bornecrantz [Thu, 24 Jun 2010 00:30:00 +0000 (02:30 +0200)]
i965g: Remove last references to drm_api
Jakob Bornecrantz [Wed, 23 Jun 2010 22:44:53 +0000 (00:44 +0200)]
swrastg: Use target-helpers
Jakob Bornecrantz [Wed, 23 Jun 2010 23:53:05 +0000 (01:53 +0200)]
gallium: Use debugging helper in all drm targets
Jakob Bornecrantz [Wed, 23 Jun 2010 22:50:08 +0000 (00:50 +0200)]
gallium: Add debug target helper
Jakob Bornecrantz [Wed, 23 Jun 2010 21:51:52 +0000 (23:51 +0200)]
gallium: Fix scons build
Jakob Bornecrantz [Wed, 23 Jun 2010 21:14:22 +0000 (23:14 +0200)]
gallium: Remove drm_api and all references to it
Jakob Bornecrantz [Thu, 24 Jun 2010 00:10:18 +0000 (02:10 +0200)]
r600g: Move bootstrap code to target
Brian Paul [Wed, 23 Jun 2010 23:38:58 +0000 (17:38 -0600)]
gallium/docs: document TGSI_SEMANTIC_EDGEFLAG
Brian Paul [Wed, 23 Jun 2010 23:38:42 +0000 (17:38 -0600)]
gallium/docs: update TEXTURE_SHADOW_MAP MAX_PREDICATE_REGISTERS
Brian Paul [Wed, 23 Jun 2010 23:00:10 +0000 (17:00 -0600)]
gallium/docs: fix definitions of TGSI_SEMANTIC_POSITION, COLOR
Brian Paul [Wed, 23 Jun 2010 17:32:08 +0000 (11:32 -0600)]
draw: use gallium's TRUE/FALSE
Vinson Lee [Wed, 23 Jun 2010 22:17:00 +0000 (15:17 -0700)]
llvmpipe: Remove unnecessary header.
Jakob Bornecrantz [Wed, 23 Jun 2010 21:03:28 +0000 (23:03 +0200)]
nouveau: Move bootstrap code to targets
Well sorta, at least I removed the drm_api dependancy and the
target can layer anything it wants to now.
Jakob Bornecrantz [Wed, 23 Jun 2010 20:49:11 +0000 (22:49 +0200)]
nouveau: Rename winsys file
Corbin Simpson [Wed, 23 Jun 2010 18:34:51 +0000 (11:34 -0700)]
glhd: Simple rasterizer checks.
From the documentation.
Corbin Simpson [Wed, 23 Jun 2010 18:25:52 +0000 (11:25 -0700)]
id, glhd: Unbreak texturing.
Argfl.
Corbin Simpson [Wed, 23 Jun 2010 18:06:42 +0000 (11:06 -0700)]
glhd: Use an environment variable (GALAHAD) to enable. Off by default.
Keith Whitwell [Wed, 23 Jun 2010 17:06:52 +0000 (18:06 +0100)]
draw: don't try to precalculate the pipeline output primitive
We were previously calculating a value which was either the geometry
shader output primitive or the application's input primitive, and
passing that to the various front/middle/back components for use as
the ultimate rendering primtive.
Unfortunately, this was not correct -- if the vcache decomposition
path is active and geometry shaders are *not* active, we can end up
with a third primitive -- specifically the decomposed version of the
input primitive.
Rather than trying to precalculate this, just let the individual
components inform their successors about which primitive type they are
recieving.
Brian Paul [Wed, 23 Jun 2010 15:19:18 +0000 (09:19 -0600)]
draw: mask off DRAW_PIPE_FLAG_MASK bits in prim decompose code
Any elt may potentially have flags bits set so mask off those bits
everywhere.
Fixes crashes with demos/gamma.c, redbook/polys.c, etc. but polygon
stippling is still broken.
Chia-I Wu [Fri, 18 Jun 2010 16:21:39 +0000 (00:21 +0800)]
egl: Add a test for MESA_EGL_NO_X11_HEADERS.
When the macro is defined, X11 headers will not be included.
Chia-I Wu [Thu, 17 Jun 2010 09:09:01 +0000 (17:09 +0800)]
egl: Add support for EGL_MESA_drm_display.
The extension defines eglGetDRMDisplay that creates an EGLDisplay from a
DRM fd. Calling eglCreateWindowSurace or eglCreatePixmapSurface with
such displays will generate EGL_BAD_NATIVE_WINDOW or
EGL_BAD_NATIVE_PIXMAP.
Chia-I Wu [Thu, 17 Jun 2010 09:14:03 +0000 (17:14 +0800)]
egl: Introduce platform displays internally.
This commit introduces type-safe platform displays internally. A
platform display consists of a generic pointer and an enum that
specifies the platform.
An EGLDisplay is created from a platform display. Native displays
become platform displays whose platform is determined by
_eglGetNativePlatform(). Platform windows and pixmaps may also be
introduced if needed.
Corbin Simpson [Wed, 23 Jun 2010 07:11:42 +0000 (00:11 -0700)]
radeong: Disable Galahad for now; breaks texturing.
Corbin Simpson [Wed, 23 Jun 2010 06:40:11 +0000 (23:40 -0700)]
id, glhd: Fix malloc/calloc of struct.
( >&)
Corbin Simpson [Wed, 23 Jun 2010 06:11:01 +0000 (23:11 -0700)]
glhd: Add query protection.
Not quite copied from r300g. This is slightly more API-compliant.
Corbin Simpson [Wed, 23 Jun 2010 06:00:44 +0000 (23:00 -0700)]
glhd: Grab framebuffer state checks from r300g.
Corbin Simpson [Wed, 23 Jun 2010 05:46:15 +0000 (22:46 -0700)]
glhd: Grab resource_copy_region from r300g.
Corbin Simpson [Wed, 23 Jun 2010 05:39:53 +0000 (22:39 -0700)]
glhd: Grab is_format_supported warning from r300g.
Corbin Simpson [Wed, 23 Jun 2010 05:37:39 +0000 (22:37 -0700)]
glhd: Add glhd_warn for unconditional stderr output.
Design decision. Bad API errors should never be silenced.
Of course, you can always not use galahad.
Corbin Simpson [Wed, 23 Jun 2010 05:13:33 +0000 (22:13 -0700)]
id, glhd: Fix segfault with misreferenced pipe member.
And remove the offending member to keep that from happening again.
Corbin Simpson [Wed, 23 Jun 2010 05:09:52 +0000 (22:09 -0700)]
targets, radeong: Add Galahad.
Currently unconditional and causes segfaults.
Corbin Simpson [Wed, 23 Jun 2010 05:00:43 +0000 (22:00 -0700)]
configure: Add galahad to default build.
Corbin Simpson [Wed, 23 Jun 2010 04:58:56 +0000 (21:58 -0700)]
gallium/drivers: Create Galahad from identity.
Galahad is a sanity-checking layer meant to replace the crufty and
scattered sanity checks inside drivers with a robust, non-silenceable,
useful set of warnings and errors that can be used to keep misbehaving
state trackers from going unnoticed.
Brian Paul [Tue, 22 Jun 2010 14:37:44 +0000 (08:37 -0600)]
mesa: fix attachment error checking for glGetFramebufferAttachmentParameteriv()
This is a follow-on to commit
80dfec3e53fd5b5c8c31fb16376c9910258c91b0.
The valid attachments for glGetFramebufferAttachmentParameteriv() depends
on whether we're querying the default FBO or a user-created FBO.
Marek Olšák [Wed, 23 Jun 2010 01:58:46 +0000 (03:58 +0200)]
r300/compiler: allow 1024 instructions in r5xx vertex shaders
Marek Olšák [Wed, 23 Jun 2010 01:57:27 +0000 (03:57 +0200)]
r300/compiler: allow 32 temporaries in vertex shaders
Marek Olšák [Wed, 23 Jun 2010 01:55:20 +0000 (03:55 +0200)]
r300/compiler: emulate loops in vertex shaders
It is not perfect, but it is the best we got.
Jakob Bornecrantz [Wed, 23 Jun 2010 01:31:18 +0000 (03:31 +0200)]
gallium: Drop sw drm winsys
Last user went away
Jakob Bornecrantz [Fri, 18 Jun 2010 17:07:26 +0000 (19:07 +0200)]
i965g: Move bootstrap code to targets
Jakob Bornecrantz [Wed, 23 Jun 2010 00:41:49 +0000 (02:41 +0200)]
i965g: Rename winsys file
Jakob Bornecrantz [Wed, 23 Jun 2010 00:28:47 +0000 (02:28 +0200)]
i965g: Moved pci_id to winsys struct
Jakob Bornecrantz [Fri, 18 Jun 2010 17:07:04 +0000 (19:07 +0200)]
target-helpers: Add inline helpers
Marek Olšák [Tue, 22 Jun 2010 23:39:26 +0000 (01:39 +0200)]
mesa: fix assertion failure for GL_ALPHA FBOs
Marek Olšák [Tue, 22 Jun 2010 23:35:11 +0000 (01:35 +0200)]
r300g: attempt to fix texture corruption on RV505
Marek Olšák [Tue, 22 Jun 2010 22:20:11 +0000 (00:20 +0200)]
r300g: index buffer range checking
Jakob Bornecrantz [Tue, 22 Jun 2010 20:55:13 +0000 (22:55 +0200)]
i915g: Revert debug hunks from last commit
Jakob Bornecrantz [Sat, 12 Jun 2010 19:01:58 +0000 (21:01 +0200)]
i915g: Reduce state emission by using a index bias
Jakob Bornecrantz [Sat, 12 Jun 2010 15:05:52 +0000 (17:05 +0200)]
i915g: Drop fifo code in vbuf
Jakob Bornecrantz [Sat, 12 Jun 2010 15:03:41 +0000 (17:03 +0200)]
i915g: Change state code in vbuf code
Jakob Bornecrantz [Sat, 12 Jun 2010 12:09:59 +0000 (14:09 +0200)]
i915g: Rework debug print code
Jakob Bornecrantz [Fri, 11 Jun 2010 23:34:54 +0000 (01:34 +0200)]
i915g: Switch to state atoms
Jakob Bornecrantz [Fri, 11 Jun 2010 23:22:51 +0000 (01:22 +0200)]
i915g: i915_state_sampler.c code style