Oliver McFadden [Sun, 13 May 2007 12:43:40 +0000 (12:43 +0000)]
r300: Use the defined values when writing to R300_SE_VTE_CNTL.
You can verify this is correct with the following code.
assert (0x043f ==
(R300_VTX_W0_FMT | R300_VPORT_X_SCALE_ENA | R300_VPORT_X_OFFSET_ENA
| R300_VPORT_Y_SCALE_ENA | R300_VPORT_Y_OFFSET_ENA |
R300_VPORT_Z_SCALE_ENA | R300_VPORT_Z_OFFSET_ENA));
Oliver McFadden [Sun, 13 May 2007 12:36:27 +0000 (12:36 +0000)]
r300: Added a TODO comment for the R300_VAP_INPUT_ROUTE_[01]_0 values.
Oliver McFadden [Sun, 13 May 2007 09:09:30 +0000 (09:09 +0000)]
r300: Changed some more functions to static functions.
This required reordering some of the functions which is why the diff is a little
larger.
Oliver McFadden [Sun, 13 May 2007 08:59:54 +0000 (08:59 +0000)]
r300: Changed a couple of functions in r300_state.c to static functions.
Oliver McFadden [Sun, 13 May 2007 08:43:30 +0000 (08:43 +0000)]
r300: Removed the unused r300_aos_rec (replaced by r300_dma_region) structure.
Oliver McFadden [Sun, 13 May 2007 08:28:51 +0000 (08:28 +0000)]
r300: Use #if 0 for disabled code, rather than commenting it out.
Oliver McFadden [Sun, 13 May 2007 08:21:50 +0000 (08:21 +0000)]
r300: Removed a couple of obsolete/commented out includes.
Oliver McFadden [Sun, 13 May 2007 07:51:41 +0000 (07:51 +0000)]
r300: A few very minor indenting corrections.
Oliver McFadden [Sun, 13 May 2007 07:44:20 +0000 (07:44 +0000)]
r300: Use the defined values for the interpolater (interp_magic) magic values.
Oliver McFadden [Sun, 13 May 2007 06:39:24 +0000 (06:39 +0000)]
r300: Use the defined values when writing to R300_VAP_INPUT_CNTL_[01].
You can verify this is correct with the following code.
assert (0x00000001 == R300_INPUT_CNTL_0_COLOR);
assert (0x00000405 ==
(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR |
R300_INPUT_CNTL_TC0));
Oliver McFadden [Sat, 12 May 2007 17:16:56 +0000 (17:16 +0000)]
Revert "r300: Perform the locking closer to the DRM texture upload call."
This reverts commit
93881edb46fc95e1cfb4ded4e8a5db92612d3e4d.
Roland Scheidegger [Sat, 12 May 2007 09:20:24 +0000 (11:20 +0200)]
bring over recent radeonMakeCurrent fixes for r300 to radeon/r200
Oliver McFadden [Sat, 12 May 2007 01:53:56 +0000 (01:53 +0000)]
r300: Removed the name argument to ALLOC_STATE; do the name via the macro.
Oliver McFadden [Sat, 12 May 2007 01:13:54 +0000 (01:13 +0000)]
r300: Renamed r300DoEmitState to r300EmitAtoms.
Oliver McFadden [Sat, 12 May 2007 00:14:33 +0000 (00:14 +0000)]
r300: Perform the locking closer to the DRM texture upload call.
This might help if with attaching GDB if the driver gets into a -EAGAIN loop.
Oliver McFadden [Fri, 11 May 2007 23:35:37 +0000 (23:35 +0000)]
r300: Removed unused FORCE_32BITS_ELTS define.
Oliver McFadden [Fri, 11 May 2007 23:33:47 +0000 (23:33 +0000)]
r300: Removed the unused CPT macro.
Oliver McFadden [Fri, 11 May 2007 23:32:03 +0000 (23:32 +0000)]
r300: Moved r300PackFloat24 near r300PackFloat32.
Oliver McFadden [Fri, 11 May 2007 23:13:08 +0000 (23:13 +0000)]
r300: Added insert_at_tail to the ALLOC_STATE macro.
Oliver McFadden [Fri, 11 May 2007 23:03:40 +0000 (23:03 +0000)]
Revert "r300: Merged radeon_span.c."
This reverts commit
0aa998b2ab6fdfe139b54de9868e2383440685d0.
Oliver McFadden [Fri, 11 May 2007 22:26:47 +0000 (22:26 +0000)]
r300: Corrected another error; regexp replaced something it shouldn't have.
Oliver McFadden [Fri, 11 May 2007 22:23:31 +0000 (22:23 +0000)]
r300: Corrected some macro errors from the previous commit.
Oliver McFadden [Fri, 11 May 2007 22:21:19 +0000 (22:21 +0000)]
r300: Reduced the diff on radeon_lock.[ch].
Oliver McFadden [Fri, 11 May 2007 22:02:52 +0000 (22:02 +0000)]
r300: Initial work on merging radeon_lock.[ch].
Oliver McFadden [Fri, 11 May 2007 21:56:10 +0000 (21:56 +0000)]
r300: Merged radeon_span.c.
Oliver McFadden [Fri, 11 May 2007 21:45:14 +0000 (21:45 +0000)]
r300: Cleaned up function names in r300_texstate.c.
Oliver McFadden [Fri, 11 May 2007 21:40:00 +0000 (21:40 +0000)]
r300: Enable hardware 3D texture support. Fixes the stex3d demo.
Oliver McFadden [Fri, 11 May 2007 21:36:13 +0000 (21:36 +0000)]
Oliver McFadden [Fri, 11 May 2007 21:31:22 +0000 (21:31 +0000)]
r300: Cleaned up the blend factor function.
Oliver McFadden [Fri, 11 May 2007 21:22:37 +0000 (21:22 +0000)]
r300: Removed the r300BindProgram function; mesa default does better checking.
Oliver McFadden [Fri, 11 May 2007 21:08:56 +0000 (21:08 +0000)]
r300: Removed deprecated/disabled VBO code from r300_mem.c
Also removed a couple of unused fields from the r300_memory_manager structure.
Oliver McFadden [Fri, 11 May 2007 20:48:35 +0000 (20:48 +0000)]
r300: Indented r300_mem.c; I forgot this because it used to be radeon_mm.c.
Oliver McFadden [Fri, 11 May 2007 20:09:01 +0000 (20:09 +0000)]
r300: Use __FUNCTION__ not __func__.
Just for consistency; most of the code already uses __FUNCTION__.
Oliver McFadden [Fri, 11 May 2007 20:06:43 +0000 (20:06 +0000)]
r300: Assert if the primitive type is unknown; this can't really happen.
Oliver McFadden [Fri, 11 May 2007 19:57:07 +0000 (19:57 +0000)]
r300: Moved some code around in r300_render.c and general clean up.
Brian [Fri, 11 May 2007 21:35:12 +0000 (15:35 -0600)]
user-declared uniform structs not supported yet (see bug 10908)
Brian [Fri, 11 May 2007 21:34:29 +0000 (15:34 -0600)]
don't ignore return value of _slang_codegen_global_variable()
Brian [Fri, 11 May 2007 21:12:40 +0000 (15:12 -0600)]
remove some unneeded code in init_machine()
Oliver McFadden [Fri, 11 May 2007 19:44:35 +0000 (19:44 +0000)]
r300: Removed some checking in r300NumVerts that is not needed.
According to Aapo Tahkola the OpenGL specification defines the behaviour when
there are not enough vertices for the primitive type, thus DRI drivers do not
need to perform verification on the number of vertices per primitive.
Oliver McFadden [Fri, 11 May 2007 19:28:35 +0000 (19:28 +0000)]
r300: Function naming correction in r300_texmem.c.
Oliver McFadden [Fri, 11 May 2007 19:21:08 +0000 (19:21 +0000)]
r300: Cleaned up function names in r300_state.c.
Oliver McFadden [Fri, 11 May 2007 17:10:59 +0000 (17:10 +0000)]
r300: Cleaned up function naming in r300_emit.c.
Oliver McFadden [Fri, 11 May 2007 17:07:09 +0000 (17:07 +0000)]
r300: Renamed r300_maos.c to r300_emit.c; it contains mostly emit code now.
Brian [Fri, 11 May 2007 14:41:34 +0000 (08:41 -0600)]
Remove unused FB_* tokens, re-indent code.
Brian [Fri, 11 May 2007 14:39:18 +0000 (08:39 -0600)]
When feeding back texcoords, don't divide by W. See bug 10913.
Patrick Baggett [Fri, 11 May 2007 14:19:33 +0000 (08:19 -0600)]
Fix some bugs related to loop counters and conditional branching.
Brian [Thu, 10 May 2007 23:33:14 +0000 (17:33 -0600)]
more indentation fixes, remove 'register' keywords
Brian [Thu, 10 May 2007 23:30:44 +0000 (17:30 -0600)]
re-indent some code
Brian [Thu, 10 May 2007 22:14:10 +0000 (16:14 -0600)]
document exp(), mod() fixes
Brian [Thu, 10 May 2007 20:49:06 +0000 (14:49 -0600)]
regenerated
Brian [Thu, 10 May 2007 20:48:55 +0000 (14:48 -0600)]
Implement exp() in terms of __asm float_power. Fix typo in mod(vec4) function.
exp() was using __asm float_exp (OPCODE_EXP) but that computes base two, not e.
See bug 10907.
Ian Romanick [Thu, 10 May 2007 22:00:41 +0000 (15:00 -0700)]
Fix reversed enable logic in enable_texture
Fix bug inserted in commit
c9e723e5013443df984cb3987ffa3a9ba3384b89.
Discovered by Oliver McFadden (z3ro).
Oliver McFadden [Thu, 10 May 2007 22:01:41 +0000 (22:01 +0000)]
r300: Added TODO comment regarding texture tiling; I'm not sure about this.
Oliver McFadden [Thu, 10 May 2007 21:40:20 +0000 (21:40 +0000)]
r300: Corrected a compile error introduced by one of the previous commits.
Oliver McFadden [Thu, 10 May 2007 21:28:04 +0000 (21:28 +0000)]
r300: Removed obsolete start_index16_packet/start_index32_packet.
It's all in r300_render.c now.
Oliver McFadden [Thu, 10 May 2007 17:50:25 +0000 (17:50 +0000)]
r300: Moved some more emit code into r300_render.c.
Oliver McFadden [Thu, 10 May 2007 17:45:27 +0000 (17:45 +0000)]
r300: Moved some more of the emit code into r300_render.c.
Brian [Thu, 10 May 2007 16:52:19 +0000 (10:52 -0600)]
document tex sampler bug fix, code changes
Brian [Thu, 10 May 2007 16:51:54 +0000 (10:51 -0600)]
Replace `pkg-config --cflags libdrm` with LIBDRM_CFLAGS, remove disabled lines, remove obsolete comments.
Ian Romanick [Thu, 10 May 2007 15:20:04 +0000 (08:20 -0700)]
Convert "bit" parameters to GLbitfield. Fix cut-and-paste bug in _mesa_IsEnabled
These changes are based on patch review comments from Brian Paul, Alan
Hourihane, and vehemens.
Ian Romanick [Thu, 10 May 2007 04:51:49 +0000 (21:51 -0700)]
Refactor the loop in unbind_texobj_from_texunits.
Common code was pulled out of the per-target if-statment and put at the end
of the for-loop. The common code is guarded by a new variable, curr, that
is set to point to the unit's current target in each if-statement.
Ian Romanick [Thu, 10 May 2007 04:49:35 +0000 (21:49 -0700)]
Refactor queries of GL_(SOURCE|OPERAND)[012]_(ALPHA|RGB).
Most switch-statements that have cases for these enums already use code like:
const GLuint idx = pname - GL_SOURCE0_RGB;
... texUnit->Combine.SourceRGB[idx] ...
This patch just brings the remaining bits up to speed.
Ian Romanick [Thu, 10 May 2007 04:46:43 +0000 (21:46 -0700)]
Refactor the way TestProxyTexImage is called in texture_error_check.
Ian Romanick [Thu, 10 May 2007 04:45:27 +0000 (21:45 -0700)]
Refactor Enable / Disable and IsEnabled bits related to texture targets.
Oliver McFadden [Wed, 9 May 2007 22:16:18 +0000 (22:16 +0000)]
r300: Name the render functions in r300_render.c consistently.
Oliver McFadden [Wed, 9 May 2007 22:07:10 +0000 (22:07 +0000)]
r300: Return -1 for error.
Oliver McFadden [Wed, 9 May 2007 22:06:19 +0000 (22:06 +0000)]
r300: Probably a good idea to always check the vertices; it's a WARN_ONCE so the
performance impact is extremely minimal.
Oliver McFadden [Wed, 9 May 2007 22:03:43 +0000 (22:03 +0000)]
r300: Added some more Doxygen documentation and made some functions static.
Oliver McFadden [Wed, 9 May 2007 21:44:07 +0000 (21:44 +0000)]
r300: Removed the "texmicrotile" variable; the tiling code is disabled via a
compiler conditional anyway; probably broken?
Oliver McFadden [Wed, 9 May 2007 21:41:03 +0000 (21:41 +0000)]
r300: Converted a few "if (0)" into "if (RADEON_DEBUG & DEBUG_TEXTURE)".
Brian [Wed, 9 May 2007 22:22:53 +0000 (16:22 -0600)]
Tweak the shell scripting for descending into and building subdirs.
In general, use this:
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE)) || exit 1; \
fi \
done
Basically, silently skip missing subdirs but generate an error and stop if
there's a compilation or install problem.
This was done inconsistantly before. In once case, a missing subdir was
causing us to go into an infinte loop!
Oliver McFadden [Wed, 9 May 2007 21:06:28 +0000 (21:06 +0000)]
r300: Cleaned up radeon_context.h slightly; mostly Indent.
Oliver McFadden [Wed, 9 May 2007 20:52:09 +0000 (20:52 +0000)]
r300: radeon_span.h is now common code; radeon_span.c still needs some work.
Oliver McFadden [Wed, 9 May 2007 20:49:49 +0000 (20:49 +0000)]
r300: Renamed the R300 memory manager from "radeon" to "r300"; it's R300
specific.
Oliver McFadden [Wed, 9 May 2007 20:41:27 +0000 (20:41 +0000)]
r300: Indented radeon_span.h
Oliver McFadden [Wed, 9 May 2007 20:36:48 +0000 (20:36 +0000)]
r300: Further reduced the radeon_span.c diff.
Oliver McFadden [Wed, 9 May 2007 19:30:59 +0000 (19:30 +0000)]
r300: I have no idea why this was forced on, but it seems to work fine when
restored to the previous behaviour.
Oliver McFadden [Wed, 9 May 2007 19:24:59 +0000 (19:24 +0000)]
r300: Removed the dangerous R300_SPAN_DISABLE_LOCKING flag.
Enabling R300_SPAN_DISABLE_LOCKING would probably cause more lockups; I think
there are a couple of other little bugs in this code, too. It's best to remove
it.
Oliver McFadden [Wed, 9 May 2007 18:44:56 +0000 (18:44 +0000)]
r300: Removed a bit of disabled code.
Oliver McFadden [Wed, 9 May 2007 18:37:46 +0000 (18:37 +0000)]
r300: Don't need to include the deprecated r300_program.h in some files.
The only file that still requires r300_program.h is r300_ioctl.c; and it should
use the new defines in r300_reg.h!
Oliver McFadden [Wed, 9 May 2007 18:31:04 +0000 (18:31 +0000)]
r300; Indent would destroy r300_reg.h, so add *INDENT-OFF*.
Christoph Bill [Wed, 9 May 2007 18:25:12 +0000 (18:25 +0000)]
r300: Added a few more Doxygen comments.
Christoph Bill [Wed, 9 May 2007 18:24:06 +0000 (18:24 +0000)]
r300: Added some Doxygen comments.
Oliver McFadden [Wed, 9 May 2007 18:14:42 +0000 (18:14 +0000)]
r300: Converted "rp" variables (r300_fragment_program) to "fp".
Oliver McFadden [Wed, 9 May 2007 18:11:38 +0000 (18:11 +0000)]
r300: Don't need to sleep here; might cause performance problems the first time.
Oliver McFadden [Wed, 9 May 2007 18:07:16 +0000 (18:07 +0000)]
r300: Removed the obsolete GLX_DIRECT_RENDERING define.
Oliver McFadden [Wed, 9 May 2007 18:06:10 +0000 (18:06 +0000)]
r300: Further reduced the diff between radeon_span.[ch].
Oliver McFadden [Wed, 9 May 2007 18:01:43 +0000 (18:01 +0000)]
r300: Indented both copies of radeon_span.[ch] in preparation for merging.
Oliver McFadden [Wed, 9 May 2007 16:10:08 +0000 (16:10 +0000)]
r300: Removed the deprecated VTXFMT code.
This was okayed by Jerome Glisse and Keith Whitwell on the dri-devel IRC channel
and list, respectively.
Oliver McFadden [Wed, 9 May 2007 15:57:30 +0000 (15:57 +0000)]
r300: The empty check_space doesn't and never has done anything; removed it.
Oliver McFadden [Wed, 9 May 2007 15:38:18 +0000 (15:38 +0000)]
r300: Fix a couple of static errors.
Oliver McFadden [Wed, 9 May 2007 15:28:38 +0000 (15:28 +0000)]
r300: Fixed indenting from previous commit
d28f6d91760374e2eb71b541b0f259f81dd73c69.
Oliver McFadden [Wed, 9 May 2007 15:21:13 +0000 (15:21 +0000)]
r300: Added R300_PRIM_NUM_VERTICES_MASK suggested by Jerome Glisse.
Oliver McFadden [Wed, 9 May 2007 15:19:05 +0000 (15:19 +0000)]
r300: Fixed some more function names.
Note there might be some calls to the old function names in conditionally
disabled code, but I think I've got them all.
Oliver McFadden [Wed, 9 May 2007 15:07:34 +0000 (15:07 +0000)]
r300: Changed r300_run_vb_render calls to r300RunRender in some conditionally
disabled code.
Oliver McFadden [Wed, 9 May 2007 14:45:42 +0000 (14:45 +0000)]
r300: Added a "not implemented yet" comment back.
Oliver McFadden [Wed, 9 May 2007 14:23:22 +0000 (14:23 +0000)]
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa
Oliver McFadden [Wed, 9 May 2007 14:19:45 +0000 (14:19 +0000)]
r300: Last of the indent changes. :)
Brian [Wed, 9 May 2007 14:17:57 +0000 (08:17 -0600)]
add pointers to git repo for drm/libpciaccess, replace & with &
Oliver McFadden [Wed, 9 May 2007 14:17:16 +0000 (14:17 +0000)]
r300: Indented r300_cmdbuf.[ch].