root [Tue, 11 Sep 2007 21:24:43 +0000 (15:24 -0600)]
prefix some include filenames with shader/
Brian [Tue, 11 Sep 2007 16:57:37 +0000 (10:57 -0600)]
Fix-up #includes to remove some -I options.
eg: #include "shader/program.h" and remove -I$(TOP)/src/mesa/program
Brian [Tue, 11 Sep 2007 16:56:35 +0000 (10:56 -0600)]
In _mesa_make_current(), don't unbind FBOs from the old context.
This fixes the X server crash reported by KeithP on Aug 29.
The old context's FBOs will be unreferenced during context destruction so
there's no memleak with this change.
Brian [Tue, 11 Sep 2007 15:21:34 +0000 (09:21 -0600)]
Update depth test state when binding new framebuffer object
Brian [Tue, 11 Sep 2007 15:20:48 +0000 (09:20 -0600)]
fix comment
Jesse Barnes [Tue, 11 Sep 2007 10:55:40 +0000 (03:55 -0700)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Jesse Barnes [Tue, 11 Sep 2007 10:54:34 +0000 (03:54 -0700)]
intel: disentangle planes & pipes
This is the Mesa portion of the pipe & plane disambiguation. Mesa needs to use
the new assumptions about plane vs. pipe mappings and should use the new SAREA
field names to avoid confusion.
Xiang, Haihao [Tue, 11 Sep 2007 08:57:07 +0000 (16:57 +0800)]
i965: take the secondary color into account when drawing
bitmap. fix#10688
Xiang, Haihao [Tue, 11 Sep 2007 08:49:02 +0000 (16:49 +0800)]
i965: limit on LOD Bias, fix#11987
Brian [Mon, 10 Sep 2007 14:35:53 +0000 (08:35 -0600)]
clean-up (see bug 12317)
Patrice Mandin [Thu, 6 Sep 2007 20:36:12 +0000 (22:36 +0200)]
nouveau: nv10: check NULL pointers
Patrice Mandin [Thu, 6 Sep 2007 20:33:22 +0000 (22:33 +0200)]
nouveau: init depth range
Patrice Mandin [Thu, 6 Sep 2007 18:00:25 +0000 (20:00 +0200)]
nouveau: nv10: replace macros by loop to set vertex attributes
Patrice Mandin [Thu, 6 Sep 2007 17:58:59 +0000 (19:58 +0200)]
nouveau: need parenthesis around macro params, generator should be fixed
Patrice Mandin [Thu, 6 Sep 2007 17:12:58 +0000 (19:12 +0200)]
Disable an assert for hw that do not emit POS as first vertex attrib, like nv1x
Patrice Mandin [Wed, 5 Sep 2007 21:35:52 +0000 (23:35 +0200)]
nouveau: nv10: emit vertex data in proper order for nv1x hw
Brian [Wed, 5 Sep 2007 16:03:32 +0000 (10:03 -0600)]
updated bug report guidelines
Christoph Kubisch [Wed, 5 Sep 2007 16:03:08 +0000 (10:03 -0600)]
updated VC7 project files
Xiang, Haihao [Wed, 5 Sep 2007 05:31:01 +0000 (13:31 +0800)]
i965: only take non-varying attribute into account when
compiling sf_prog. fix bug#11378 (which is introduced by
commit
d619cceea47dc3070ebb7f7ea4f8b6b31a672d38)
Stephane Marchesin [Tue, 4 Sep 2007 21:21:21 +0000 (23:21 +0200)]
nouveau: who needs nv03 ?
Patrice Mandin [Tue, 4 Sep 2007 17:13:07 +0000 (19:13 +0200)]
nouveau: nv10: need to transpose mesa model+proj matrix for hw
Brian [Mon, 3 Sep 2007 22:20:05 +0000 (16:20 -0600)]
Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
Patrice Mandin [Mon, 3 Sep 2007 21:42:33 +0000 (23:42 +0200)]
nouveau: nv10: forgot function to set modelview matrix
Patrice Mandin [Mon, 3 Sep 2007 21:08:57 +0000 (23:08 +0200)]
nouveau: separate modelview and projection matrix updates
Xiang, Haihao [Sat, 1 Sep 2007 07:43:15 +0000 (15:43 +0800)]
i965: Correct build_lighting in i965 driver according to
commit
6dd98e9853a6984150aa47467112e016c40a4ab4.
Brian [Fri, 31 Aug 2007 22:42:05 +0000 (16:42 -0600)]
Fix problem introduced in previous commit in which a state variable (uniform) is written to. (see bug 12239)
Also, added some assertions to the emit_arg() and emit_dst() functions to
catch this kind of error in the future.
Patrice Mandin [Fri, 31 Aug 2007 17:45:14 +0000 (19:45 +0200)]
nouveau: nv10: remove setting projection matrix when scaling viewport
Patrice Mandin [Fri, 31 Aug 2007 17:43:16 +0000 (19:43 +0200)]
nouveau: add hw-dependent function to update modelview*projection matrix
Xiang, Haihao [Fri, 31 Aug 2007 08:50:48 +0000 (16:50 +0800)]
i965: Calculate the positional light in homogeneous coordinates.
fix bug#11009
Zou Nan hai [Fri, 31 Aug 2007 05:42:20 +0000 (13:42 +0800)]
optimize 965 clip
1. increase clip thread number to 2
2. do cliptest for -rhw
Xiang, Haihao [Fri, 31 Aug 2007 04:51:36 +0000 (12:51 +0800)]
i965: Take the upper limitation on LOD into account.
David Moore [Thu, 30 Aug 2007 21:43:30 +0000 (14:43 -0700)]
Bug #10571: Fix 965 line clipping when neither vertex needs clipping.
Roland Scheidegger [Thu, 30 Aug 2007 16:04:49 +0000 (18:04 +0200)]
fix another occurence of movaps which might not be aligned
Brian [Thu, 30 Aug 2007 14:41:38 +0000 (08:41 -0600)]
s/movaps/movups/ (see bug 12216)
Xiang, Haihao [Wed, 29 Aug 2007 19:11:10 +0000 (15:11 -0400)]
i965: store read drawable info in intel_context. Some OpenGL
operations are based on read drawable. fix bug#10136.
Xiang, Haihao [Wed, 29 Aug 2007 17:03:34 +0000 (13:03 -0400)]
i965: check NULL pointer. fix bug#12193
Xiang, Haihao [Wed, 29 Aug 2007 14:13:10 +0000 (10:13 -0400)]
i965: samplers group in fours in WM_STATE. fix bug#9415
Keith Packard [Tue, 28 Aug 2007 19:27:51 +0000 (12:27 -0700)]
Add register defines for hw binning
Xiang, Haihao [Tue, 28 Aug 2007 15:35:52 +0000 (11:35 -0400)]
i965: flush batch buffer when getting the maximum. This makes
some 3D programs such as pymol work well.
Brian [Mon, 27 Aug 2007 18:00:19 +0000 (12:00 -0600)]
added --noclear option to demonstrate rendering without glClear
Colin McDonald [Mon, 27 Aug 2007 16:47:32 +0000 (10:47 -0600)]
fixed problem with big glDrawArrays (see bug 12141)
Brian [Mon, 27 Aug 2007 16:36:11 +0000 (10:36 -0600)]
new __gluInvertMatrix() function (Mesa bug 6748)
Patrice Mandin [Mon, 27 Aug 2007 09:45:30 +0000 (11:45 +0200)]
nouveau: nv10: set total stride of vertex array for POS attribute
Patrice Mandin [Sat, 25 Aug 2007 15:46:53 +0000 (17:46 +0200)]
nouveau: nv10: also set modelview0 matrix to identity
Patrice Mandin [Sat, 25 Aug 2007 10:36:03 +0000 (12:36 +0200)]
nouveau: nv10: add a scissor func, do not cache viewport settings
Patrice Mandin [Sat, 25 Aug 2007 09:39:04 +0000 (11:39 +0200)]
nouveau: nv10: properly set viewport and projection
Brian [Fri, 24 Aug 2007 07:43:58 +0000 (08:43 +0100)]
remove CallDepth++/-- accidentally removed in prev commit
Adam Jackson [Thu, 23 Aug 2007 22:38:02 +0000 (18:38 -0400)]
Unbreak Linux builds with -fvisibility=hidden.
Brian [Thu, 23 Aug 2007 07:53:43 +0000 (08:53 +0100)]
For _mesa_share_state(), update the context's references to the new share group's objects (Shane Blackett)
Brian [Thu, 23 Aug 2007 07:16:52 +0000 (08:16 +0100)]
remove unneeded CallStack array
Patrice Mandin [Wed, 22 Aug 2007 09:01:59 +0000 (11:01 +0200)]
nouveau: nv10: set projection matrix from viewport size
Patrice Mandin [Wed, 22 Aug 2007 08:28:13 +0000 (10:28 +0200)]
nouveau: nv10: initialize more of nv10 tcl engine
Patrice Mandin [Tue, 21 Aug 2007 14:55:42 +0000 (16:55 +0200)]
nouveau: nv10: Move some initialization stuff
Patrice Mandin [Tue, 21 Aug 2007 14:53:13 +0000 (16:53 +0200)]
nouveau: Use proper notifier object
Patrice Mandin [Tue, 21 Aug 2007 14:52:10 +0000 (16:52 +0200)]
nouveau: nv10: Remove commented, unsupported by hw command
Patrice Mandin [Mon, 20 Aug 2007 17:35:31 +0000 (19:35 +0200)]
Use correct object for GART
Brian [Mon, 20 Aug 2007 12:12:20 +0000 (13:12 +0100)]
refactor bounds checking code
Brian [Mon, 20 Aug 2007 11:55:34 +0000 (12:55 +0100)]
don't map buffer in _mesa_validate_DrawElements() unless needed
Patrice Mandin [Sun, 19 Aug 2007 18:12:26 +0000 (20:12 +0200)]
nouveau: nv10: only one color buffer atm
Brian [Sat, 18 Aug 2007 15:25:16 +0000 (16:25 +0100)]
some fixes for compressed cube maps (bug 11986)
Brian [Sat, 18 Aug 2007 15:10:25 +0000 (16:10 +0100)]
remove dead code left over after fixing GL_READ/DRAW_BUFFER state issues
Xiang, Haihao [Fri, 17 Aug 2007 17:36:13 +0000 (13:36 -0400)]
Brian's fix for bug9829
Xiang, Haihao [Fri, 17 Aug 2007 16:42:52 +0000 (12:42 -0400)]
i965: align width/height for volume texture
Patrice Mandin [Thu, 16 Aug 2007 19:50:34 +0000 (21:50 +0200)]
nouveau: nv10: clear a buffer
Patrice Mandin [Thu, 16 Aug 2007 19:31:30 +0000 (21:31 +0200)]
nouveau: nv10: add function to clear a buffer
Patrice Mandin [Thu, 16 Aug 2007 19:28:40 +0000 (21:28 +0200)]
nouveau: store render buffer pointers in context, to access them when clearing buffer
Patrice Mandin [Thu, 16 Aug 2007 18:53:29 +0000 (20:53 +0200)]
nouveau: nv10: create objects needed to clear buffer
Brian [Thu, 16 Aug 2007 17:52:48 +0000 (18:52 +0100)]
Rework the GL_READ_BUFFER, GL_DRAW_BUFFER state repairs that Roland previously did.
Basically, in update_framebuffer() (which should be called after an FBO is bound
with MakeCurrent or BindFramebuffer) we check if the FBO is a window-system FBO.
If it is, update the FBO's GL_READ/DRAW_BUFFER state according to the context state.
Old code still in place but disabled with #if 0 / #endif.
Brian [Thu, 16 Aug 2007 15:49:35 +0000 (16:49 +0100)]
update comments, etc related to Read/DrawBuffer state
Brian [Thu, 16 Aug 2007 15:43:31 +0000 (16:43 +0100)]
remove reference to ctx->Color.DrawBuffer
Brian [Thu, 16 Aug 2007 10:06:39 +0000 (11:06 +0100)]
replace Proxy1D/2D/etc fields with ProxyTex[] array
Brian [Thu, 16 Aug 2007 10:06:13 +0000 (11:06 +0100)]
Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.
Simplification in colortab.c too.
Brian [Thu, 16 Aug 2007 09:28:23 +0000 (10:28 +0100)]
replace separate 1D/2D/etc fields with an array indexed by texture target
Brian [Thu, 16 Aug 2007 09:27:24 +0000 (10:27 +0100)]
remove old Saved1D/2D/etc fields
Brian [Thu, 16 Aug 2007 09:05:00 +0000 (10:05 +0100)]
Bring over the texobj refcounting changes from mesa_7_0_branch
Michel Dänzer [Thu, 16 Aug 2007 06:45:16 +0000 (08:45 +0200)]
i915tex: Unreference texture buffers on context destruction.
Not doing this could cause the buffers to leak under some circumstances.
Roland Scheidegger [Thu, 16 Aug 2007 00:41:03 +0000 (02:41 +0200)]
suppress warning about ncon visuals (bug #6689)
Xiang, Haihao [Wed, 15 Aug 2007 05:28:00 +0000 (13:28 +0800)]
i965: use BRW_TEXCOORDMODE_CLAMP instead of BRW_TEXCOORDMODE_CLAMP_BORDER
to implement GL_CLAMP
Ben Skeggs [Wed, 15 Aug 2007 04:27:46 +0000 (14:27 +1000)]
nouveau: Use half the notifier block for query objects.
Ben Skeggs [Wed, 15 Aug 2007 04:26:15 +0000 (14:26 +1000)]
nouveau: Keep drm channel alloc struct around.
Ben Skeggs [Mon, 13 Aug 2007 13:12:04 +0000 (23:12 +1000)]
nouveau: reindent nouveau_span.c
Ben Skeggs [Mon, 13 Aug 2007 12:05:15 +0000 (22:05 +1000)]
nouveau: Remove ALLOW_MULTI_SUBCHANNEL hack
Irrelevant, since we depend on working context switching now.
Ben Skeggs [Mon, 13 Aug 2007 10:38:10 +0000 (20:38 +1000)]
nouveau: Always render offscreen, emulate front buffer rendering.
Ben Skeggs [Mon, 13 Aug 2007 10:02:04 +0000 (20:02 +1000)]
nouveau: Split nouveau_buffers into nouveau_mem and nouveau_fbo
Ben Skeggs [Mon, 13 Aug 2007 07:21:02 +0000 (17:21 +1000)]
nouveau: reindent nouveau_buffers.h
Ben Skeggs [Mon, 13 Aug 2007 07:02:20 +0000 (17:02 +1000)]
nouveau: reindent nouveau_buffers.c
Ben Skeggs [Mon, 13 Aug 2007 06:46:27 +0000 (16:46 +1000)]
nouveau: Lets only do private buffers.
Brian [Tue, 14 Aug 2007 10:56:59 +0000 (11:56 +0100)]
Fix a few more problems with freeing FBOs/textures during context destruction.
Free FBOs before textures since the later may be referenced by the former.
Need to bind the context we're destroying if there isn't a current context
so that ctx->DeleteTexture() etc can be used.
Xiang, Haihao [Tue, 14 Aug 2007 03:39:23 +0000 (11:39 +0800)]
xdemo case: Wei Wang's patch for bug#9759
Brian [Mon, 13 Aug 2007 16:37:30 +0000 (17:37 +0100)]
free any render/framebuffers left in hash tables when freeing shared state
Michel Dänzer [Mon, 13 Aug 2007 11:22:43 +0000 (13:22 +0200)]
i915tex: Make sure pitch is aligned properly for render-to-texture.
Just always align texture pitch to multiples of 64 bytes for now, pending a
more sophisticated scheme to do it only when really necessary.
Brian [Mon, 13 Aug 2007 10:29:46 +0000 (11:29 +0100)]
Implement mutex/locking around texture object reference counting.
Use new _mesa_reference_texobj() function for referencing/unreferencing
textures. Add new assertions/tests to try to detect invalid usage of
deleted textures.
Brian [Mon, 13 Aug 2007 10:09:48 +0000 (11:09 +0100)]
added some missing Default1D/2DArray texture code
Xiang, Haihao [Mon, 13 Aug 2007 09:16:27 +0000 (17:16 +0800)]
i965: fix projtex_mask
projtex_mask is only an 8bit field, and wm.input_size_masks includes
other attributes' information, therefore right shift is needed.
Xiang, Haihao [Mon, 13 Aug 2007 03:43:37 +0000 (11:43 +0800)]
i915: satisfy certain alignment restrictions for small
compressed texture
Dan Torop [Sun, 12 Aug 2007 11:41:13 +0000 (13:41 +0200)]
fix spantmp2 READ_RGBA inline asm (#11931)
Keith Whitwell [Sat, 11 Aug 2007 12:48:19 +0000 (13:48 +0100)]
Make it easier to compare against the pipe driver debug code.
Keith Whitwell [Sat, 11 Aug 2007 12:40:22 +0000 (13:40 +0100)]
Improve debugging further.
Pull apart some key packets into individual fields and print sanely.
Keith Whitwell [Fri, 10 Aug 2007 18:17:35 +0000 (19:17 +0100)]
Better debugging
Xiang, Haihao [Fri, 10 Aug 2007 08:37:30 +0000 (16:37 +0800)]
i965: roland's DXTn format texture patch(bug10347)