Commit graph

13873 commits

Author SHA1 Message Date
Brian Paul
d3aa16d92f i965: use bitfields in brw_sf_unit_key struct 2009-01-29 11:10:56 -07:00
Brian Paul
818bda3d74 intel: remove unused intel_rendering_to_texture() 2009-01-29 11:07:55 -07:00
Brian Paul
ba367f68cc i965: fix render to FBO/texture orientation bugs
Anytime we're not rendering to the default/window FBO, need to invert
rendering, not just when rendering to a texture.  Otherwise, if a FBO
consists of a mix of textures and renderbuffers the up/down orientation
was inconsistant.

Fixes shadowtex.c bad rendering.
2009-01-29 11:07:14 -07:00
Brian Paul
2897cee99f mesa: fix a render to texture FBO validation bug
When glTexImage() is called we need to re-validate any FBOs that point to
the texture (i.e. render-to-texture) since changing the texture's size/format
will effect FBO completeness.

We don't keep a list of all FBOs rendering into each texture (which would be
a bit messy) so we check all FBOs in existance.  To optimize this, the
gl_texture_object->_RenderToTexture flag is used to avoid checking textures
that have never been used as renderbuffers.  So, we only walk over all FBOs
(there's usually only a few) when glTexImage() modifies a RTT texture.

Fixes a bug seen in shadowtex.c when toggling packed depth/stencil mode.
2009-01-29 09:20:18 -07:00
Ian Romanick
425c803c03 intel: Fix up some extension string issues
Move the remaining extension string enables to intel_extensions.c.
Make sure that GL_NV_texture_env_combine4 is not enabled on i830.
2009-01-28 16:28:11 -08:00
Ian Romanick
d485ee54dd Make GLX_SGIX_pbuffer mandatory
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28 16:28:11 -08:00
Ian Romanick
8aa209c766 Make GL_ARB_draw_buffers mandatory
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28 16:28:11 -08:00
Ian Romanick
474cda6fa9 Make GL_{EXT,SUN}_multi_draw_arrays and GL_IBM_multimode_draw_arrays mandatory
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28 16:28:11 -08:00
Ian Romanick
82b9661894 Make GL_ARB_vertex_buffer_object mandatory
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28 16:28:10 -08:00
Ian Romanick
2b77b1d62e Make GL_ARB_multisample mandatory
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28 16:28:10 -08:00
Ian Romanick
33fa5e4bfa Make GL_ARB_texture_compression mandatory
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2009-01-28 16:28:10 -08:00
Brian Paul
26da28c995 mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_texture
Everyone should be using the newer/better ARB versions of these extensions.
2009-01-28 16:49:28 -07:00
Brian Paul
f584752afe docs: document GL_EXT_texture_swizzle 2009-01-28 15:06:54 -07:00
Brian Paul
3dcc48e688 i965: minor tweak: replace OPCODE_MOV with OPCODE_SWZ
Just to reinforce the understanding that an extended swizzle with 0 and 1
terms is possible there.
2009-01-28 14:51:35 -07:00
Brian Paul
c0d3b7679a i965: implement GL_EXT_texture_swizzle
If the texture swizzle is not XYZW (no-op) add an extra MOV instruction
after the TEX instruction to rearrange the components.
2009-01-28 14:50:03 -07:00
Brian Paul
9e7903e492 i965: minor clean-up, comments, etc. 2009-01-28 14:48:41 -07:00
Brian Paul
68acc61fc3 Merge commit 'origin/master' into texture_swizzle 2009-01-28 14:45:18 -07:00
Brian Paul
faa48915d2 i965: fix bug in pass0_precalc_mov()
Previously, "in-place" swizzles such as:
   MOV t, t.xxyx;
were handled incorrectly.  Fixed by splitting the one loop into two loops so we
get all the refs before assigning them (to avoid potential clobbering).
2009-01-28 14:35:58 -07:00
Brian Paul
2ace634024 i965: minor comment additions/edits 2009-01-28 14:33:07 -07:00
Brian Paul
89fddf978c i965: minor improvements in brw_wm_populate_key() 2009-01-28 11:42:42 -07:00
Brian Paul
177eda834e i965: remove pad field 2009-01-28 11:38:42 -07:00
Brian Paul
f78c388b6c i965: widen per-texture bitfields for 16 texture image units 2009-01-28 11:37:11 -07:00
Brian Paul
3147d7785d i965: minor comments 2009-01-28 11:36:39 -07:00
Brian Paul
72f0b4a55b mesa: additional GL_INVALID_OPERATION tests for texture swizzle 2009-01-28 10:44:04 -07:00
Brian Paul
54c62ba5c3 mesa: implement texture swizzling in swrast
And enable GL_EXT_texture_swizzle for software drivers.
2009-01-28 10:31:05 -07:00
Brian Paul
4a89e51c5f mesa: set/get new state for GL_EXT_texture_swizzle 2009-01-28 10:27:33 -07:00
Brian Paul
be1a76f88f mesa: if texObj is NULL in fetch_texel_*(), return black. 2009-01-28 09:16:11 -07:00
Eric Anholt
0f72de5538 dri2: add complaints for more initialization failures.
Somehow we're running into DRI2Authenticate failing, and silent demotion to
swrast is bad.
2009-01-27 14:34:29 -08:00
Eric Anholt
65d39a9eed intel: clean up more pf mess. 2009-01-27 12:05:47 -08:00
Brian Paul
318e53a4bf mesa: refactor glTexParameter code 2009-01-27 11:07:21 -07:00
Brian Paul
38768dbc76 mesa: move call to _mesa_update_framebuffer_visual()
Update the visual info in the _mesa_test_framebuffer_completeness()
function when we've determined the FBO to be "complete".

Fixes regression seen in progs/demos/shadowtex.c
2009-01-27 09:49:27 -07:00
Brian Paul
3cf7f9887a i915: rename some functions 2009-01-26 17:23:59 -07:00
Brian Paul
d0c8ed73cc intel: replace i915/intel_state.c and i965/intel_state.c with shared file 2009-01-26 16:40:08 -07:00
Brian Paul
69fd665b64 intel: whitespace changes 2009-01-26 16:38:01 -07:00
Brian Paul
84c8b5bbf9 intel: move some driver functions around
A step toward consolidating i915/intel_state.c and i965/intel_state.c
2009-01-26 16:33:45 -07:00
Brian Paul
72ee0e247d intel: check if stencil test is enabled in intel_stencil_drawpixels() 2009-01-26 14:22:30 -07:00
Brian Paul
723648f2ee intel: save/restore GL matrix mode in intel_meta_set_passthrough_transform(), intel_meta_restore_transform() 2009-01-26 14:01:32 -07:00
Brian Paul
36daee1c7b intel: asst. casts to silence warnings 2009-01-26 12:44:05 -07:00
Brian Paul
6c244b0f32 intel: #include clean-ups 2009-01-26 12:39:29 -07:00
Brian Paul
d555cdbe3e intel: remove old #includes 2009-01-26 12:39:28 -07:00
Brian Paul
aae2729aeb intel: make intelUpdateScreenFromSAREA() static 2009-01-26 12:39:28 -07:00
Brian Paul
66c7f06413 intel: remove unused var 2009-01-26 12:39:28 -07:00
Brian Paul
4006c5e452 intel: move intelInitExtensions() and related code into new intel_extensions.c 2009-01-26 12:39:28 -07:00
Brian Paul
4451eb2e75 intel: move glClear-related code into new intel_clear.c file 2009-01-26 12:39:28 -07:00
Brian Paul
6fcebbe719 intel: Move swap-related functions from intel_buffers.c to new intel_swapbuffers.c 2009-01-26 12:39:28 -07:00
Brian Paul
3b23a8e07d i965: scissor rect was inverted when rendering to texture 2009-01-26 12:39:28 -07:00
Robert Ellison
523febe12e mesa: add missing texture_put_row_rgb() function in texrender.c
The wrap_texture() function doesn't set the renderbuffer PutRowRGB() method,
which is used to implement DrawPixels().  This fix adds an implementation
of this method.
2009-01-26 10:23:38 -07:00
Brian Paul
ea8d0aa94b docs: added GL_NV_texture_env_combine4 2009-01-23 17:40:24 -07:00
Brian Paul
cba5ce1665 Merge branch 'tex_combine4' 2009-01-23 17:39:44 -07:00
Brian Paul
628b52241b i965: init array->Format fields (see bug 19708) 2009-01-23 17:37:21 -07:00