Ian Romanick [Mon, 6 Mar 2006 16:31:50 +0000 (16:31 +0000)]
Don't try to bind to proxy texture target. This is defined by the spec to be
an error. Since we're working with a proxy target, don't bother using real
texture data.
Add a missing new-line in an error printf.
Ian Romanick [Sat, 4 Mar 2006 04:46:10 +0000 (04:46 +0000)]
Build test for bugzilla #3050
Ian Romanick [Sat, 4 Mar 2006 04:44:47 +0000 (04:44 +0000)]
Test case for bugzilla #3050.
Roland Scheidegger [Fri, 3 Mar 2006 15:03:04 +0000 (15:03 +0000)]
Use standard ARB names instead of vendor-specific NV names for the ARB/NV_vertex_program enums in common state handling code, and update comments accordingly. Change some slightly confusing code which gave the impression GL_VERTEX_PROGRAM_ARB and GL_VERTEX_PROGRAM_NV enums were different.
Roland Scheidegger [Fri, 3 Mar 2006 14:11:19 +0000 (14:11 +0000)]
fix up the emit_func list in the experimental arbprogram sse code.
Roland Scheidegger [Fri, 3 Mar 2006 02:46:03 +0000 (02:46 +0000)]
Fix bogus span mask in s_atifragshader.c leading to trouble when the pixel was later discarded by z test (this fixes doom3 r200 renderpath with swrast). Fix calling _swrast_alpha_test potentially leading to bogus results when Alpha Test might not be enabled. While here, don't disable deferred_texture (early z) when ATI_fragment_shader is active, as it is not necessary (for the record, this boosts doom3 swrast performance by roughly a factor of 2 (4 seconds per frame now...) with the r200 render path, might be a worthwile optimization for fragment programs which don't write z).
Keith Whitwell [Thu, 2 Mar 2006 20:16:34 +0000 (20:16 +0000)]
Add position_invarient support
Roland Scheidegger [Thu, 2 Mar 2006 12:06:57 +0000 (12:06 +0000)]
Fix more enums defined not only by one extension when queried by glGet (GL_COLOR_SUM_EXT, GL_POINT_SPRITE_NV, GL_POINT_SPRITE_COORD_ORIGIN, GL_TRANSPOSE_CURRENT_MATRIX_ARB). Fix similar bugs (also those previously overseen dependant on NV/ARB_vertex_program) in glIsEnabled. Add missing GL_COLOR_SUM_EXT enum to glIsEnabled.
Brian Paul [Thu, 2 Mar 2006 04:12:34 +0000 (04:12 +0000)]
added GL_EXT_framebuffer_blit, etc
Brian Paul [Thu, 2 Mar 2006 03:54:14 +0000 (03:54 +0000)]
test glBlitFramebufferEXT w/ -blit flag
Brian Paul [Thu, 2 Mar 2006 03:51:04 +0000 (03:51 +0000)]
improved error msg
Brian Paul [Thu, 2 Mar 2006 03:46:33 +0000 (03:46 +0000)]
check FEATURE_EXT_framebuffer_blit
Brian Paul [Thu, 2 Mar 2006 03:45:28 +0000 (03:45 +0000)]
plug in BlitFramebuffer function
Brian Paul [Thu, 2 Mar 2006 03:37:18 +0000 (03:37 +0000)]
implementation of _swrast_BlitFramebuffer()
Roland Scheidegger [Wed, 1 Mar 2006 23:11:14 +0000 (23:11 +0000)]
Fix glGet with enums which are used not only in NV_vertex_program, but other extensions too (ARB_vertex_program, ARB_fragment_program, NV_fragment_program), if no support for NV_vertex_program is present. While here, fix return value if enum is used which is not supported by the exposed extensions (GL_INVALID_ENUM instead of GL_INVALID_VALUE). Fix some compile-time #ifs depending on NV_vertex/fragment_program which should also be dependant on ARB_vertex/fragment_program. See bug #6070
Brian Paul [Wed, 1 Mar 2006 15:44:20 +0000 (15:44 +0000)]
No need for _mesa_save_error() to be public.
glVertexAttrib() w/ bad index should generate GL_INVALID_VALUE, not
GL_INVALID_ENUM.
Misc clean-ups.
Brian Paul [Wed, 1 Mar 2006 15:36:34 +0000 (15:36 +0000)]
added BlitFramebuffer() support
Brian Paul [Wed, 1 Mar 2006 15:33:56 +0000 (15:33 +0000)]
New comments. Use tuples () instead of lists [] in a few places.
Brian Paul [Wed, 1 Mar 2006 15:32:38 +0000 (15:32 +0000)]
added Flush in glXCopyContext()
Brian Paul [Wed, 1 Mar 2006 02:09:40 +0000 (02:09 +0000)]
updated comment
Brian Paul [Wed, 1 Mar 2006 02:07:50 +0000 (02:07 +0000)]
Added glBlitFramebufferEXT function.
Brian Paul [Wed, 1 Mar 2006 02:02:43 +0000 (02:02 +0000)]
remove temporary tokens, more error checks for blit function
Brian Paul [Wed, 1 Mar 2006 02:00:58 +0000 (02:00 +0000)]
added s_blit.c
Brian Paul [Wed, 1 Mar 2006 01:57:30 +0000 (01:57 +0000)]
_swrast_blit_framebuffer() function
Brian Paul [Wed, 1 Mar 2006 01:54:59 +0000 (01:54 +0000)]
GL_EXT_framebuffer_blit tokens/functions
Aapo Tahkola [Tue, 28 Feb 2006 23:39:32 +0000 (23:39 +0000)]
Free temps when possible
Aapo Tahkola [Tue, 28 Feb 2006 23:22:48 +0000 (23:22 +0000)]
Dont let (possibly) undefined z component reach hw as its unused
Aapo Tahkola [Tue, 28 Feb 2006 23:17:00 +0000 (23:17 +0000)]
No need to call *_FIREVERTICES twice.
Aapo Tahkola [Tue, 28 Feb 2006 23:08:28 +0000 (23:08 +0000)]
Fix aliasing bug (Benjamin Herrenschmidt)
Brian Paul [Tue, 28 Feb 2006 21:45:09 +0000 (21:45 +0000)]
Allow error checking to look for presence of either of two extensions.
See bug 6070.
Brian Paul [Tue, 28 Feb 2006 15:48:43 +0000 (15:48 +0000)]
only run shader on active fragments in the span
Brian Paul [Tue, 28 Feb 2006 15:48:19 +0000 (15:48 +0000)]
check if active fragment shader for deferred texturing/shading
Brian Paul [Tue, 28 Feb 2006 15:44:33 +0000 (15:44 +0000)]
check for active shader, set FRAGPROG_BIT in raster mask
Brian Paul [Mon, 27 Feb 2006 15:45:38 +0000 (15:45 +0000)]
silence a bunch of warnings
Michal Krol [Mon, 27 Feb 2006 14:41:41 +0000 (14:41 +0000)]
More GLSL code:
- add x86 code generator;
- add full support for uniforms in ARB_shader_objects;
- add assembly instruction: global_addr;
- reorganize #includes;
- built-in uniforms accessed by index, rather than by name;
- add some entries to x86sse rtasm;
- add configurations to VC6 projects: 'Release x86' and 'Debug x86';
- #define SLANG_X86 active only on VC6 x86 builds;
- introduce code export table for a shader;
- remove GNU license from the noise library;
Brian Paul [Sun, 26 Feb 2006 18:18:12 +0000 (18:18 +0000)]
re-formated with indent.
Brian Paul [Sun, 26 Feb 2006 18:02:13 +0000 (18:02 +0000)]
Remove need to initialize the InstSize[] array elements by just storing
the instruction size in _mesa_alloc_instruction().
Brian Paul [Sun, 26 Feb 2006 17:16:37 +0000 (17:16 +0000)]
display list clean-ups
Roland Scheidegger [Sat, 25 Feb 2006 02:03:12 +0000 (02:03 +0000)]
Add all pci ids known by ddx to radeon dri driver. Remove the entries not known by ddx (probably secondary ids, non-existant cards and similar). Add rs400 to the family enum, and configure the rv410 like a 2 quad chip (?)
Brian Paul [Fri, 24 Feb 2006 18:19:11 +0000 (18:19 +0000)]
fix broken _mesa_copy_context() for GL_LIGHTING_BIT
Brian Paul [Fri, 24 Feb 2006 17:58:48 +0000 (17:58 +0000)]
need to check for _NEW_BUFFERS in xmesa_update_state()
Brian Paul [Fri, 24 Feb 2006 17:16:57 +0000 (17:16 +0000)]
Fix _mesa_copy_texture_state() so that we copy texture object bindings,
not the actual contents of texture objects. This makes glXCopyContext()
work properly.
Brian Paul [Fri, 24 Feb 2006 15:36:24 +0000 (15:36 +0000)]
EXT_framebuffer_object (Dave Reveman)
Brian Paul [Thu, 23 Feb 2006 15:36:39 +0000 (15:36 +0000)]
include inttypes.h if __osf__ defined (Randall Hand)
Brian Paul [Thu, 23 Feb 2006 14:29:03 +0000 (14:29 +0000)]
update Blender link
Brian Paul [Wed, 22 Feb 2006 16:54:05 +0000 (16:54 +0000)]
add some #includes, fix some prototypes (bug 5992)
Brian Paul [Wed, 22 Feb 2006 16:44:04 +0000 (16:44 +0000)]
include proper header file, remove local extern declarations
Brian Paul [Wed, 22 Feb 2006 16:43:26 +0000 (16:43 +0000)]
add missing prototypes, use _slang_ prefix on non-static functions
Brian Paul [Wed, 22 Feb 2006 16:35:34 +0000 (16:35 +0000)]
silence a variety of compiler warnings
Brian Paul [Wed, 22 Feb 2006 15:50:57 +0000 (15:50 +0000)]
updated GLUT link
Michal Krol [Tue, 21 Feb 2006 12:35:06 +0000 (12:35 +0000)]
More GLSL code:
- uniforms (only GetLocation, Uniform1f and Uniform4fv for now for demos);
- fix bugs and optimize array size handling;
- 2D texture sampling (needs Enable(TEXTURE_2D) to work);
- decrease built-in library assembly size by 30%.
Jouk Jansen [Tue, 21 Feb 2006 12:28:34 +0000 (12:28 +0000)]
Committing in .
Update OpenVMS makefiles
Modified Files:
Mesa/src/mesa/shader/slang/descrip.mms
Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/tnl/descrip.mms
----------------------------------------------------------------------
Jeremy Kolb [Sun, 19 Feb 2006 22:31:26 +0000 (22:31 +0000)]
Added xcb dri config file.
Jeremy Kolb [Sun, 19 Feb 2006 22:30:46 +0000 (22:30 +0000)]
Remove old linux-x86-xcb (didn't do anything).
Removed reference to linux-x86-xcb and added linux-dri-xcb in Makefile.
Michal Krol [Sat, 18 Feb 2006 15:11:18 +0000 (15:11 +0000)]
More GLSL code.
- general constructors allowed;
- implement noise functions (from Stefan Gustavson - thanks!)
- cosmetic stuff.
Keith Whitwell [Fri, 17 Feb 2006 17:03:14 +0000 (17:03 +0000)]
Fix STENCIL_WRITE_MASK defn for bug 5902
Aapo Tahkola [Thu, 16 Feb 2006 19:50:40 +0000 (19:50 +0000)]
Skip ARL while we dont implement it. Fix broken nv vps but do it with software for now.
Roland Scheidegger [Thu, 16 Feb 2006 17:16:33 +0000 (17:16 +0000)]
Reinstate vertex format after a rasterization fallback for both r200 and radeon driver when a tcl fallback is active, fixes a blender issue with non-tcl hw (bug #5601)
Eric Anholt [Wed, 15 Feb 2006 21:03:34 +0000 (21:03 +0000)]
Include dix-config.h if HAVE_DIX_CONFIG_H is defined. This will be used by the
X Server to get things like _XSERVER64 (for X headers) and NO_LIBCWRAPPER
defined consistently when its builds Mesa internally.
Brian Paul [Wed, 15 Feb 2006 15:59:37 +0000 (15:59 +0000)]
Set NumInstructions (bug 5864)
Brian Paul [Wed, 15 Feb 2006 15:51:01 +0000 (15:51 +0000)]
Fix a few warnings:
- nested comments (use #if 0 / #endif instead)
- missing default clause in switch statements
- use of possibly undefined variables
Michal Krol [Wed, 15 Feb 2006 11:15:16 +0000 (11:15 +0000)]
Add support for forward function declarations.
Michal Krol [Wed, 15 Feb 2006 11:12:47 +0000 (11:12 +0000)]
Add fragment shader execute entry.
Michal Krol [Wed, 15 Feb 2006 11:09:26 +0000 (11:09 +0000)]
Add s_arbshader.c, s_arbshader.h.
Michal Krol [Wed, 15 Feb 2006 11:07:56 +0000 (11:07 +0000)]
Add swrast/s_arbshader.c.
Michal Krol [Wed, 15 Feb 2006 11:06:00 +0000 (11:06 +0000)]
Add arbshader stage.
Michal Krol [Wed, 15 Feb 2006 11:03:57 +0000 (11:03 +0000)]
Enable texcoords when program object in use.
Michal Krol [Wed, 15 Feb 2006 11:02:07 +0000 (11:02 +0000)]
Get arbfslight demo running.
Michal Krol [Wed, 15 Feb 2006 11:00:15 +0000 (11:00 +0000)]
Enable GL_ARB_fragment_shader extension.
Michal Krol [Wed, 15 Feb 2006 10:58:52 +0000 (10:58 +0000)]
Demonstrate GLSL fragment and vertex shaders.
Brian Paul [Wed, 15 Feb 2006 04:10:55 +0000 (04:10 +0000)]
remove stray 'foo' line
Brian Paul [Tue, 14 Feb 2006 15:04:45 +0000 (15:04 +0000)]
replace size_t * w/ unsigned int * (Jurg Billeter)
Brian Paul [Tue, 14 Feb 2006 14:57:04 +0000 (14:57 +0000)]
fix AIX issues (bug 5874)
Jouk Jansen [Mon, 13 Feb 2006 12:00:29 +0000 (12:00 +0000)]
Update OpenVMS compile support
Michal Krol [Mon, 13 Feb 2006 11:47:41 +0000 (11:47 +0000)]
More glsl code.
Michal Krol [Mon, 13 Feb 2006 11:45:57 +0000 (11:45 +0000)]
REVISION 3.
Remove illegal operators for overloading.
Michal Krol [Mon, 13 Feb 2006 11:42:48 +0000 (11:42 +0000)]
Cosmetic changes.
Michal Krol [Mon, 13 Feb 2006 11:40:32 +0000 (11:40 +0000)]
Delete most of the comments.
Minor tweaks with the functions.
Add experimental print functions.
Michal Krol [Mon, 13 Feb 2006 11:38:37 +0000 (11:38 +0000)]
Get it running for ARB_vertex_shader.
Add experimental print functions to builtin library.
Some functionality missing:
- automatic arrays;
- general constructors;
- local variable initialization;
- texture sampling and noise;
- semantic error checking;
- function prototypes.
Michal Krol [Mon, 13 Feb 2006 11:31:16 +0000 (11:31 +0000)]
Rename current_program to CurrentProgram.
Temporary vertex_shader execution code.
Michal Krol [Mon, 13 Feb 2006 11:27:33 +0000 (11:27 +0000)]
Add tnl\t_vb_arbshader.c.
Michal Krol [Mon, 13 Feb 2006 11:25:43 +0000 (11:25 +0000)]
Add tnl/t_vb_arbshader.c.
Michal Krol [Mon, 13 Feb 2006 11:23:36 +0000 (11:23 +0000)]
Add ARB_vertex_shader stage just before render stage.
If enabled, all other stages, except render, are disabled.
Michal Krol [Mon, 13 Feb 2006 11:04:27 +0000 (11:04 +0000)]
Enable GL_ARB_shader_objects, GL_ARB_shading_language_100 and
GL_ARB_vertex_shader extensions.
Michal Krol [Mon, 13 Feb 2006 10:56:54 +0000 (10:56 +0000)]
Rename current glsl program variable.
Michal Krol [Mon, 13 Feb 2006 10:55:14 +0000 (10:55 +0000)]
Add _mesa_atanf and _mesa_asinf functions.
Eric Anholt [Sat, 11 Feb 2006 02:59:38 +0000 (02:59 +0000)]
Add the ability to define NO_LIBCWRAPPER to avoid libcwrapper brain damage.
If it's true that libcwrapper usage isn't necessary ever in the DllLoader world,
then this code should probbaly all go away.
Dave Airlie [Fri, 10 Feb 2006 21:46:17 +0000 (21:46 +0000)]
commit to fixup MGL namespacing for XGL
Aapo Tahkola [Fri, 10 Feb 2006 17:26:44 +0000 (17:26 +0000)]
Workaround problems with NWN. (Tilman Sauerbeck)
Brian Paul [Thu, 9 Feb 2006 14:28:40 +0000 (14:28 +0000)]
remove the test for XFree86Server from prev patch (bug 5835)
Alan Hourihane [Wed, 8 Feb 2006 22:05:42 +0000 (22:05 +0000)]
Check DDX for 1.5.0
Brian Paul [Wed, 8 Feb 2006 14:52:06 +0000 (14:52 +0000)]
include dix-config.h (Mike Harris) (bug 5835)
Brian Paul [Tue, 7 Feb 2006 00:39:56 +0000 (00:39 +0000)]
David Reveman's GLX_EXT_texture_from_pixmap extension patch
Dave Airlie [Mon, 6 Feb 2006 00:09:58 +0000 (00:09 +0000)]
add vblank support to i915 driver
Brian Paul [Sun, 5 Feb 2006 16:39:19 +0000 (16:39 +0000)]
EGL 1.2 tokens/functions/etc.
Brian Paul [Sun, 5 Feb 2006 16:38:33 +0000 (16:38 +0000)]
fix typo
Brian Paul [Fri, 3 Feb 2006 17:21:54 +0000 (17:21 +0000)]
bring in changes from 6.4 branch
Roland Scheidegger [Fri, 3 Feb 2006 13:29:11 +0000 (13:29 +0000)]
replace the texture level hack used in radeon/r200 to allow larger textures with different methods to calculate the announced maximum texture sizes. Default is still the same (that is, radeon/r200 default to not announce anything which might not fit, i830/i915 default to 1 texture must fit). Bug #5785.
Brian Paul [Thu, 2 Feb 2006 17:33:26 +0000 (17:33 +0000)]
use calloc instead of malloc so try_codegen field is initialized to zero (bug 5791)
Brian Paul [Thu, 2 Feb 2006 14:30:16 +0000 (14:30 +0000)]
add some assertions to check emit_func[] table validity