OSDN Git Service
Nicolai Haehnle [Sat, 14 Jun 2008 00:28:58 +0000 (02:28 +0200)]
texenvprogram: Mark textures using ARB_shadow as ShadowSamplers
Since ARB_fragment_program and friends are defined to ignore the setting of
the GL_TEXTURE_COMPARE_FUNC parameter, we have to explicitly enable the
shadow comparison by marking the texture unit in ShadowSamplers when
appropriate.
Nicolai Haehnle [Sat, 14 Jun 2008 01:34:09 +0000 (03:34 +0200)]
r300: Add radeonCompilerDump for debugging
Nicolai Haehnle [Fri, 13 Jun 2008 23:46:19 +0000 (01:46 +0200)]
r300_fragprog: Refactor TEX transformation
Streamlining source and destination registers, as well as texcoord scaling for
RECT textures is now done in a radeon_program based transformation.
The idea is that this will allow us to optimize away unnecessary indirections
more easily.
Nicolai Haehnle [Fri, 13 Jun 2008 21:46:04 +0000 (23:46 +0200)]
r300: Add radeon_program and trivial refactoring of r300_fragprog to use it
The idea/hope is that radeon_program will serve as an intermediate
representation for r3xx up to r6xx fragment and vertex programs.
Right now, it is nothing more than a simplistic wrapper around Mesa's
prog_instruction, together with the notion of clauses, taken from r6xx docs.
The clauses will eventually be used to represent the nodes that are used in
r300 family fragment programs.
Nicolai Haehnle [Fri, 13 Jun 2008 20:09:37 +0000 (22:09 +0200)]
r300: Do not include r300_fragprog.h from r300_context.h and other cleanups
Nicolai Haehnle [Fri, 13 Jun 2008 20:03:26 +0000 (22:03 +0200)]
r300_fragprog: Remove dead declarations, move NOP declarations into source
Nicolai Haehnle [Fri, 13 Jun 2008 19:43:09 +0000 (21:43 +0200)]
r300_fragprog: Refactoring and cleanup
Refactor so that r300_pfs_compile_state "owns"/holds a pointer to
r300_fragment_program instead of the other way round. This is more natural from
an object orientation point of view.
Move the compiled hardware state into r300_fragment_program_code, in
anticipation of on-the-fly program recompilation based on external OpenGL
state.
Nicolai Haehnle [Fri, 13 Jun 2008 18:03:17 +0000 (20:03 +0200)]
r300_fragprog: Remove dead code
Nicolai Haehnle [Fri, 13 Jun 2008 18:49:52 +0000 (20:49 +0200)]
r300/r500: Separate fragprog compiler structures
r500 code still used r300_pfs_compile_state, which contains some fields that
really only make sense on r3xx type hardware. In order to allow both fragprog
implementations to go forward without disturbing each other, I've pushed this
structure down into the respective r[3|5]00_fragprog.c
Nicolai Haehnle [Fri, 13 Jun 2008 16:41:16 +0000 (18:41 +0200)]
r300: Fix depth texture GL_LUMINANCE vs. GL_INTENSITY mixup
Nicolai Haehnle [Sat, 7 Jun 2008 12:17:56 +0000 (14:17 +0200)]
r300: Reenable t->filter_1 (though currently not used)
George Sapountzis [Fri, 13 Jun 2008 12:54:08 +0000 (15:54 +0300)]
glx: load swrast_dri.so
caveats:
- does not work with old (i.e. libGLcore) xserver:
- made unbindContext a noop
- extensions:
GLX_SGI_make_current_read
GLX_EXT_texture_from_pixmap
GLX_MESA_copy_sub_buffer
George Sapountzis [Fri, 13 Jun 2008 12:52:32 +0000 (15:52 +0300)]
dri/swrast: make unbind a noop
This is for loading swrast_dri.so from libGL.
MakeContextCurrent() seems to unbind the context right after binding it and
DRI drivers also have a noop DriverAPI.UnbindContext ...
George Sapountzis [Fri, 13 Jun 2008 12:48:34 +0000 (15:48 +0300)]
dri/swrast: add OpenGL 2.1 functions
George Sapountzis [Fri, 13 Jun 2008 12:48:06 +0000 (15:48 +0300)]
glx: use ErrorMessageF
Zack Rusin [Thu, 12 Jun 2008 23:41:54 +0000 (19:41 -0400)]
silly bug: it's PROGRAM_VARYING
Zack Rusin [Thu, 12 Jun 2008 22:53:52 +0000 (18:53 -0400)]
glsl: make sure we replace all output reads with temporaries
test in if.glsl
Zack Rusin [Thu, 12 Jun 2008 23:37:26 +0000 (19:37 -0400)]
glsl: allow uniforms
Zack Rusin [Mon, 9 Jun 2008 03:05:15 +0000 (23:05 -0400)]
glsl: fix array size initialiazers using const variables
e.g.
const int kernelSize = 9;
uniform vec2 kernel[kernelSize];
Zack Rusin [Thu, 12 Jun 2008 18:19:10 +0000 (14:19 -0400)]
almost forgot - RelAddr is a boolean so use it here
Zack Rusin [Thu, 12 Jun 2008 04:03:35 +0000 (00:03 -0400)]
shaders: fix allocation of arrays of parameters
Zack Rusin [Tue, 10 Jun 2008 20:59:44 +0000 (16:59 -0400)]
glsl: implement variable array indexes
Dan Nicholson [Thu, 12 Jun 2008 13:37:45 +0000 (06:37 -0700)]
Update .gitignore for progs/glsl
Dave Airlie [Thu, 12 Jun 2008 06:26:46 +0000 (16:26 +1000)]
sparc: add swrast to dri drivers
Dave Airlie [Thu, 12 Jun 2008 02:06:50 +0000 (12:06 +1000)]
sparc: add DRI drivers for sparc patch from Fedora
Brian Paul [Thu, 12 Jun 2008 01:33:30 +0000 (19:33 -0600)]
remove obsoleted doxygen \param comments
Someone changed the function parameters but didn't bother to update the
comments.
Also, whitespace changes, clean-ups.
Brian Paul [Thu, 12 Jun 2008 01:33:14 +0000 (19:33 -0600)]
comments
Brian Paul [Tue, 10 Jun 2008 18:08:30 +0000 (12:08 -0600)]
remove unnecessary swrast, tnl includes
Brian Paul [Tue, 10 Jun 2008 16:09:03 +0000 (10:09 -0600)]
add some missing rule dependencies
Roland Scheidegger [Tue, 10 Jun 2008 13:43:33 +0000 (15:43 +0200)]
copy msaa visuals capability
Dan Nicholson [Tue, 10 Jun 2008 13:06:40 +0000 (06:06 -0700)]
Distribute version.mk in case autoconf needs to be run again
Users may need to rebuild the configure script, so we need to distribute
version.mk so autoconf can run successfully.
Xiang, Haihao [Tue, 10 Jun 2008 08:31:36 +0000 (16:31 +0800)]
Brian Paul [Mon, 9 Jun 2008 22:06:44 +0000 (16:06 -0600)]
fix Xlib libGL.so build problem.
Also, build driverfuncs.c into libmesa.a since it's always needed.
Brian Paul [Mon, 9 Jun 2008 20:09:09 +0000 (14:09 -0600)]
s/SOLO/MESA/
Brian Paul [Mon, 9 Jun 2008 19:50:44 +0000 (13:50 -0600)]
Makefile clean-ups
Brian Paul [Mon, 9 Jun 2008 19:50:31 +0000 (13:50 -0600)]
more old stuff, rename SOLO->MESA, etc
Brian Paul [Mon, 9 Jun 2008 19:50:11 +0000 (13:50 -0600)]
Makefile clean-ups
Brian Paul [Fri, 6 Jun 2008 18:38:24 +0000 (12:38 -0600)]
document makefile changes
Alan Hourihane [Mon, 9 Jun 2008 15:24:15 +0000 (16:24 +0100)]
Check for NULL pointer
George Sapountzis [Mon, 9 Jun 2008 14:47:49 +0000 (17:47 +0300)]
glx: use goto's vs. nested if's ala xserver
compile tested only
George Sapountzis [Mon, 9 Jun 2008 14:47:09 +0000 (17:47 +0300)]
glx: add dri_common.c ala xserver
also drop driFilterModes which is unused
in preparation of loading swrast_dri.so
George Sapountzis [Mon, 9 Jun 2008 14:46:39 +0000 (17:46 +0300)]
dri/swrast: minor cosmetic
Nicolai Haehnle [Sun, 8 Jun 2008 20:36:20 +0000 (22:36 +0200)]
r300: Workaround hardware readcache problem
This workaround is similar to the one found in r200_span.c.
It seems like some part of the read hardware doesn't realize that
VRAM has changed. By reading from an arbitrary position, this is fixed.
The piglit test bugs/r300-readcache is a regression test for this bug.
Brian [Sun, 8 Jun 2008 17:25:30 +0000 (11:25 -0600)]
remove realglx.[ch] from build
Roland Scheidegger [Sun, 8 Jun 2008 12:04:39 +0000 (14:04 +0200)]
i965: fix OPCODE_TEX when additional ops are needed
Corbin Simpson [Sat, 7 Jun 2008 19:37:10 +0000 (12:37 -0700)]
r300: Allow driconf to set a default anisotropy.
If an app does not use GL_EXT_tex_filter_aniso, this lets driconf set it instead.
Nicolai Haehnle [Sat, 7 Jun 2008 19:07:28 +0000 (21:07 +0200)]
r300: Some cleanups in depth and stencil state handling
This also fixes a bug with Zfunc set to GL_NEVER in glean/paths.
Nicolai Haehnle [Sat, 7 Jun 2008 18:33:28 +0000 (20:33 +0200)]
r300: Apply writemask when clearing stencil buffer
This fixes the glean/maskedClear test.
Nicolai Haehnle [Sat, 7 Jun 2008 18:25:47 +0000 (20:25 +0200)]
r300: Fix stencil buffer clear
The glean/readPixSanity test passes now.
Nicolai Haehnle [Sat, 7 Jun 2008 16:54:35 +0000 (18:54 +0200)]
r300: Further anisotropic filtering fixes
Thanks to Corbin for the initial cut today. Fixed some minor stuff (in
particular, make sure we still use a MIP_LINEAR filtering mode; anisotropy
without MIP_LINEAR filtering is not the truly pleasing anisotropy).
Nicolai Haehnle [Sat, 7 Jun 2008 12:17:36 +0000 (14:17 +0200)]
r300: Update LOD_BIAS register constants
Corbin Simpson [Sat, 7 Jun 2008 08:37:35 +0000 (01:37 -0700)]
r5xx: Unbreak anisotropic filtering?
Not quite finished, maybe? Not sure.
Corbin Simpson [Sat, 7 Jun 2008 04:53:05 +0000 (21:53 -0700)]
r5xx: Fix speedy LIT once and for all.
To do: Add a slightly more accurate LIT. Will do later.
Jose Fonseca [Sat, 7 Jun 2008 03:34:45 +0000 (12:34 +0900)]
Fix CRLF line endings.
Jose Fonseca [Sat, 7 Jun 2008 03:33:47 +0000 (12:33 +0900)]
Fix CRLF line endings.
Nicolai Haehnle [Fri, 6 Jun 2008 21:47:46 +0000 (23:47 +0200)]
r300: Improve texture layout calculations
The texture layout calculations for mipmapped cubemaps used to be completely
wrong, since the GPU expects images to be grouped by miplevel instead of by
face number.
This has been fixed now, though the memory layout is still slightly incorrect
for the smaller miplevels. Unfortunately, the docs are lacking in that area.
Nicolai Haehnle [Fri, 6 Jun 2008 19:28:08 +0000 (21:28 +0200)]
r300: Cleanup TX_MIN_FILTER defines
This commit should not affect the functionality at all, just cleanup
some of the original texture filter guesswork using information from
the register documentation.
Nicolai Haehnle [Fri, 6 Jun 2008 19:13:12 +0000 (21:13 +0200)]
r300: Remove unused variable r300_tex_obj::dirty_state and related defines
This variable was only ever written to, but nobody used its value.
Brian Paul [Fri, 6 Jun 2008 18:27:55 +0000 (12:27 -0600)]
s/subdirs/asm_subdirs/
Brian Paul [Fri, 6 Jun 2008 18:27:14 +0000 (12:27 -0600)]
move the install rules
Brian Paul [Fri, 6 Jun 2008 18:25:24 +0000 (12:25 -0600)]
remove stray semicolon
Brian Paul [Fri, 6 Jun 2008 18:24:44 +0000 (12:24 -0600)]
move a beos-ism down into drivers/beos/Makefile
Brian Paul [Fri, 6 Jun 2008 18:18:40 +0000 (12:18 -0600)]
Remove the old, complicated default build rule; use the new driver_subdirs rule
Also, all the old driver-specific rules are now gone.
Brian Paul [Fri, 6 Jun 2008 18:12:59 +0000 (12:12 -0600)]
remove more old stuff, insert new driver_subdir build rules (but not enabled yet)
Brian Paul [Fri, 6 Jun 2008 18:09:55 +0000 (12:09 -0600)]
new drivers/Makefile with simple default/clean/install rules
Brian Paul [Fri, 6 Jun 2008 18:09:01 +0000 (12:09 -0600)]
move directfb-libgl into drivers/directfb/Makefile
Brian Paul [Thu, 5 Jun 2008 22:44:11 +0000 (16:44 -0600)]
Move fbdev driver construction into src/mesa/drivers/fbdev/Makefile
Brian Paul [Thu, 5 Jun 2008 22:28:00 +0000 (16:28 -0600)]
reorder some lines, more make clean cmds
Brian Paul [Thu, 5 Jun 2008 22:27:43 +0000 (16:27 -0600)]
remove X11, Glide, OSMesa sources
Brian Paul [Thu, 5 Jun 2008 22:26:15 +0000 (16:26 -0600)]
added dependencies
Brian Paul [Thu, 5 Jun 2008 22:08:42 +0000 (16:08 -0600)]
Move building of stand-alone Mesa into drivers/x11/Makefile
Also, some re-org, renaming, and general clean-up.
We're just a few steps away from removing the all the special case rules
for building drivers.
Brian Paul [Thu, 5 Jun 2008 22:06:17 +0000 (16:06 -0600)]
new Makefile for building "stand-alone", Xlib-based libGL
Brian Paul [Thu, 5 Jun 2008 22:05:02 +0000 (16:05 -0600)]
prefix some includes with mesa/ or glapi/
Brian Paul [Thu, 5 Jun 2008 21:37:17 +0000 (15:37 -0600)]
minor changes
Brian Paul [Thu, 5 Jun 2008 21:36:07 +0000 (15:36 -0600)]
Move construction of libOSMesa.so into src/mesa/drivers/osmesa/Makefile
This removes some cruft from src/mesa/Makefile.
Something similar could be done for stand-alone / Xlib-Mesa libGL...
Brian Paul [Thu, 5 Jun 2008 21:23:46 +0000 (15:23 -0600)]
insert mesa/ before include files
Alan Hourihane [Thu, 5 Jun 2008 10:47:20 +0000 (11:47 +0100)]
Silence warning
Brian Paul [Wed, 4 Jun 2008 22:11:24 +0000 (16:11 -0600)]
fix event handling issues (such as when resizing when not animating)
Brian Paul [Wed, 4 Jun 2008 22:04:04 +0000 (16:04 -0600)]
press 'a' to toggle animation
Brian Paul [Wed, 4 Jun 2008 22:01:47 +0000 (16:01 -0600)]
code refactoring (draw_frame(0, handle_event())
Brian Paul [Wed, 4 Jun 2008 21:56:30 +0000 (15:56 -0600)]
remove references to incorrect -winwidth/-winheight, replace with -geometry
Brian Paul [Wed, 4 Jun 2008 20:41:33 +0000 (14:41 -0600)]
Set the attribute as used.
cherry-picked from gallium-0.1
Dan Nicholson [Wed, 4 Jun 2008 20:00:35 +0000 (13:00 -0700)]
autoconf: Collect arch/platform settings in one location
The architecture- and platorm-specific settings were scattered
throughout the configure script. This moves them near the beginning
before any of the driver-specific settings.
Brian Paul [Wed, 4 Jun 2008 15:33:02 +0000 (09:33 -0600)]
remove old/unused foomesa.h example header
Brian Paul [Wed, 4 Jun 2008 15:30:04 +0000 (09:30 -0600)]
call glutDestroyWindow() before exit
Xiang, Haihao [Wed, 4 Jun 2008 07:44:38 +0000 (15:44 +0800)]
i915: Fix GL_DEPTH_TEXTURE_MODE issue. (bug #16221)
Dave Airlie [Wed, 28 May 2008 05:55:44 +0000 (15:55 +1000)]
mesa/drm/ttm: allow build against non-TTM aware libdrm
I'll release a libdrm 2.3.1 without TTM apis included from a special
drm branch that should allow mesa 7.1 to build against it.
I've had to turn off DRI2 stuff.
Ian Romanick [Mon, 2 Jun 2008 18:19:35 +0000 (11:19 -0700)]
bug #16503: use INSTALL macro instead of hard-coding to bin/minstall
This is only part of the fix. Someone with more autoconf-fu will have
to fix the rest
Nicolai Haehnle [Sat, 31 May 2008 22:10:45 +0000 (00:10 +0200)]
[t_vp_build] Fix refcounting-related memory leak
This memory leak is identical to the earlier one in texenvprogram.
Fixed by not creating an additional reference to new programs in cache_item.
On top of that, remove some duplicated state setting.
Nicolai Haehnle [Sat, 31 May 2008 22:01:46 +0000 (00:01 +0200)]
[texenvprogram] Fix refcounting-related memory leak.
All newly created programs have RefCount == 1, but the fragment program cache
added an additional reference in cache_item, with the result being that none
of the programs were ever freed.
Solve the problem by not creating the additional reference in cache_item.
Dave Airlie [Sun, 1 Jun 2008 21:18:21 +0000 (07:18 +1000)]
r500: add missing brackets around depth testing
Corbin Simpson [Sun, 1 Jun 2008 18:45:30 +0000 (11:45 -0700)]
r5xx: Enable depth write emission.
Thanks to nh for the r3xx version.
Nicolai Haehnle [Sun, 1 Jun 2008 17:53:52 +0000 (19:53 +0200)]
r300: Writing to result.depth in fragment programs (R3xx; only stub for R5xx)
Setup fg_depth_src for depth writing programs and change early Z (ztop)
semantics.
Piglit's version of glean/fragprog test passes now (unlike Glean, its
dependency on EXT_fog_coord, which we don't support, is optional).
R3xx only at the moment, but should be straightforward to adapt to R5xx
(I don't own an R5xx, and I don't want to break anything.)
Nicolai Haehnle [Sun, 1 Jun 2008 11:13:32 +0000 (13:13 +0200)]
[r300] Fix KIL instruction and swizzling of texture coordinates
The KIL instruction only works if at least one texture unit is enabled
in hardware.
Texture instructions do not support swizzles, negations etc. natively,
so we now emit an explicit swizzling etc. operation when the texture coordinate
requires it.
This fixes the Piglit fp-kil test.
Corbin Simpson [Sun, 1 Jun 2008 10:23:00 +0000 (03:23 -0700)]
r5xx: Add OPCODE_FLR.
Why didn't anybody tell me we were missing this one? I thought I committed it ages ago!
Corbin Simpson [Sun, 1 Jun 2008 05:41:54 +0000 (22:41 -0700)]
r5xx: Last emit_sop() for now.
This should also clean up LIT later on.
Corbin Simpson [Sun, 1 Jun 2008 05:23:11 +0000 (22:23 -0700)]
r5xx: More emit_sop(), stage 2.
SIN/COS.
Corbin Simpson [Sun, 1 Jun 2008 05:09:38 +0000 (22:09 -0700)]
r5xx: Cleanup SOP with emit_sop().
I wish I had a snarky commit message, but I'll save that for after I get the
trig working with this.
Corbin Simpson [Sun, 1 Jun 2008 03:48:15 +0000 (20:48 -0700)]
r5xx: Dump shader constants when dumping program assembly.
Dave Airlie [Sat, 31 May 2008 23:32:55 +0000 (09:32 +1000)]
r300: disable the lowimpact fallbacks by default.
because really we should be able to just fix the driver.