[Xquartz-changes] mesa: Changes to 'refs/tags/texmem_0_3_20060923'
Jeremy Huddleston
jeremyhu at freedesktop.org
Thu Jan 1 01:06:59 PST 2015
Tag 'texmem_0_3_20060923' created by Thomas Hellström <thomas at tungstengraphics.com> at 1970-01-01 00:00 -0800
Changes since mesa-6_5-20060712:
Aapo Tahkola (1):
fix #6991
Brian Paul (25):
New config var DRI_DRIVER_SEARCH_DIR to specify where libGL should search
download/install updates
LIB_DIR is now just 'lib' or 'lib64'
define FLT_MAX_EXP to 128 if undefined
Compute ctx->Color._LogicOpEnabled in one place instead of four places!
add missing 'return' after a few _mesa_error() calls in _mesa_GetTexImage()
indentation fix
more 6.5.1 additions
Several loops over the map1/2 evaluator arrays were incorrect.
For glGetTexImage(), move the _mesa_validate_pbo_access() error check into
remove unused NEED_TWO_SIDED_LIGHTING() macro
Instead of testing ctx->_TriangleCaps for flat/smooth shading, just use ctx->Light.ShadeModel
use ctx->Light.ShadeModel instead of ctx->_TriangleCaps
move/update comments
bump MESA_TINY to 1
Some structure renaming. Prefix vertex/fragment-related structs with
check for non-nill pwc in WMesaMakeCurrent(), bug 7585
added arrayobj.[ch] files
just reindent
load SLANG_FRAGMENT_FIXED_SECONDARYCOLOR
GLUT on fbdev driver. Sean D'Epagnier
added glut fbdev files
renderbuffer fixes (Sean D'Epagnier)
code to draw engine block
casts and assertions
Claudio Ciccani (2):
Clear window's event mask before enabling handled events.
Fixed warnings.
Dave Airlie (1):
fix from i965 driver for compressed textures on texman
Eric Anholt (1):
Fix build failure in the savage driver.
Ian Romanick (1):
Move initialization of server_support from __glXProcessServerString to
Jerome Glisse (1):
r300_emit.h cleanup.
Keith Whitwell (49):
Pull the texmem i915 driver onto a new branch closer to the current trunk.
new files from merge of texmem driver
drmOpen/Close once
Correct pitch / cpp calculation
Get basic texturing working again on i945
trivial test for pbo-based texture uploads
first pass at texture uploads from pbo's with the blitter
Make bgra format more explicit
add dependent texture read test
Fixes for i945 texture layouts
Add missing wait for busy buffers in bmMapBuffer()
various texture tweaks
use mesa's texenvprogram in preference to i915 version. Enable tex_env_crossbar
dependent texture read demo
revert last commit
remove hashing for bm buffers, use an opaque pointer instead of an integer
remove i915_texprog.c as it is no longer needed
remove orphan file
Bring in improved version of the texdown demo from the original texmem branch
implement zero-copy uploads for glTexImage from suitable pixel buffer objects
Must lock hardware around call to intelEmitCopyBlit()
Add a demo illustrating various techniques for uploading dynamic (ie
Bring in writemask + TEX fix from trunk
update driver date and branch debug
Disable zero-copy texturing for now as it isn't such a win with the
Silence debug, cope with calling intel_region_cow() with lock already held.
Turn back on zcopy uploads - my timings were incorrect.
fix bzflag crashes
resize buffers in MakeCurrent
Flush driver, not just tnl module.
Check for FragmentProgram._Enabled rather than _Active. _Active is
Fix bug detecting overlapping regions in texture copypixels.
- Make point_smooth, polygon_smooth fallbacks per-primitive rather than total.
bring in recent texture swizzle changes from trunk
Fix initialization of pfPitch - measured in pixels, not bytes.
intel_batch_ioctl() lost its return type somehow
Silence warning
rationalize debugging flags
Turn some printfs into DBG's.
Fix a longstanding memory leak - intelObj->mt refcount was not deleted
Remove redundant 3d-state validation prior to blit copypixels. These
Import Brian's FBO bugfix from trunk.
Ensure that we don't wrap batchbuffers right at the beginning of a
Move get_dirty() call to after reserving space in the batchbuffer as
Add asserts to catch primitives being emitted with state still dirty,
Move get_dirty() call to after reserving space in the batchbuffer as
Fix mipmap posititioning for 2d ARB_npot textures.
pull npot mipmap test from trunk
remove duplicate
Michal Krol (9):
Optimize shaders.
More text.
Fix dependencies.
Add support for GL_MESA_shader_debug.
Program to convert .syn file to .h headers.
Commit enums for GL_MESA_shader_debug.spec.
Add support for GL_MESA_shader_debug.
Move GL_MESA_shader_debug from glext.h to gl.h.
Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492.
Michel Dänzer (2):
Revert INTEL_FIREVERTICES to flush primitives instead of asserting none pending.
Fix INTEL_DEBUG=fall.
Rune Petersen (1):
A small logic error.
Thomas Hellström (18):
texmem_0_3_branch with adaptations to the drm-ttm-0-2 branch.
Fix a FBO render offset bug.
Adapt to updated libdrm.
Wait for buffer idle unlocked before mapping in some cases.
Relax the requirement in pool_takedown in the intel batch buffer pool,
Fix fencing when submitting empty batchbuffers.
Check for NULL in intelSwapBuffers()
Fix a fencing bug.
Fix intel texture image buffer leak.
Another obscure bug causing an infinite loop when multiple contexts are
Add some more buffer usage refcounting.
Make regions screen-based instead of context based.
Fix up buffer object and region refcounting
Small COW break on destruction optimization.
Valgrind error fix.
Fix another single-drawable-multiple-contexts error, that shows up now that the
Driver date.
Update drm expected version.
Tilman Sauerbeck (3):
fix a memleak
fix another memleak
fix a memleak (that code block has been commented out for years for unknown reasons)
---
Makefile | 3
configs/aix-64 | 8
configs/aix-64-static | 4
configs/aix-gcc | 6
configs/aix-static | 2
configs/beos | 6
configs/darwin | 6
configs/darwin-x86ppc | 6
configs/default | 18
configs/freebsd | 2
configs/freebsd-dri | 4
configs/hpux10 | 2
configs/hpux10-gcc | 2
configs/hpux10-static | 4
configs/hpux11-32 | 8
configs/hpux11-32-static | 2
configs/hpux11-64 | 10
configs/hpux11-64-static | 4
configs/hpux11-ia64 | 8
configs/hpux11-ia64-static | 4
configs/hpux9 | 2
configs/hpux9-gcc | 2
configs/irix6-64 | 4
configs/irix6-64-static | 4
configs/irix6-n32 | 4
configs/irix6-n32-static | 4
configs/irix6-o32 | 4
configs/irix6-o32-static | 4
configs/linux-alpha | 6
configs/linux-alpha-static | 6
configs/linux-directfb | 4
configs/linux-dri-x86-64 | 2
configs/linux-glide | 6
configs/linux-ia64-icc | 8
configs/linux-ia64-icc-static | 2
configs/linux-icc | 4
configs/linux-icc-static | 2
configs/linux-osmesa | 2
configs/linux-osmesa16 | 2
configs/linux-osmesa32 | 2
configs/linux-profile | 6
configs/linux-solo | 8
configs/linux-sparc | 4
configs/linux-sparc5 | 4
configs/linux-ultrasparc | 6
configs/linux-x86-64 | 2
configs/linux-x86-64-static | 2
configs/linux-x86-glide | 6
configs/linux-x86-static | 2
configs/netbsd | 2
configs/openbsd | 6
configs/osf1 | 6
configs/osf1-static | 2
configs/solaris-x86 | 2
configs/solaris-x86-gcc | 6
configs/solaris-x86-gcc-static | 6
configs/sunos4 | 2
configs/sunos4-gcc | 2
configs/sunos4-static | 2
configs/sunos5 | 8
configs/sunos5-gcc | 4
configs/sunos5-smp | 8
configs/sunos5-v8 | 8
configs/sunos5-v8-static | 2
configs/sunos5-v9 | 10
configs/sunos5-v9-static | 4
configs/ultrix-gcc | 2
docs/MESA_shader_debug.spec | 139
docs/VERSIONS | 3
docs/download.html | 9
docs/enums.txt | 5
docs/glfbdev-driver.html | 73
docs/install.html | 15
include/GL/gl_mangle.h | 5
progs/demos/Makefile | 9
progs/demos/engine.c | 216
progs/demos/glslnoise.c | 45
progs/demos/streaming_rect.c | 407 +
progs/demos/texdown.c | 133
progs/demos/vao_demo.c | 13
progs/directfb/Makefile | 2
progs/egl/Makefile | 20
progs/osdemos/Makefile | 8
progs/redbook/Makefile | 2
progs/samples/Makefile | 2
progs/slang/Makefile | 22
progs/tests/arbnpot-mipmap.c | 184
progs/trivial/Makefile | 2
progs/trivial/quad-tex-dep.c | 245
progs/trivial/quad-tex-pbo.c | 181
progs/xdemos/Makefile | 2
src/Makefile | 6
src/egl/drivers/demo/Makefile | 6
src/egl/drivers/dri/Makefile | 6
src/egl/main/Makefile | 6
src/glu/Makefile | 4
src/glu/mesa/Makefile | 10
src/glu/sgi/Makefile | 10
src/glut/beos/Makefile | 10
src/glut/directfb/Makefile | 6
src/glut/directfb/window.c | 5
src/glut/fbdev/Makefile | 78
src/glut/fbdev/cursors.h | 7099 +++++++++++++++++++++++
src/glut/fbdev/glut_fbdev.c | 2199 +++++++
src/glut/ggi/Makefile | 6
src/glut/glx/Makefile | 10
src/glut/mini/Makefile | 6
src/glw/Makefile | 10
src/glx/mini/Makefile | 12
src/glx/x11/Makefile | 10
src/glx/x11/dri_glx.c | 2
src/glx/x11/glxext.c | 72
src/glx/x11/glxextensions.c | 9
src/mesa/Makefile | 20
src/mesa/drivers/beos/Makefile | 10
src/mesa/drivers/directfb/Makefile | 2
src/mesa/drivers/directfb/idirectfbgl_mesa.c | 138
src/mesa/drivers/dri/Makefile | 6
src/mesa/drivers/dri/Makefile.template | 15
src/mesa/drivers/dri/common/dri_bufmgr.c | 493 +
src/mesa/drivers/dri/common/dri_bufmgr.h | 99
src/mesa/drivers/dri/common/dri_bufpool.h | 86
src/mesa/drivers/dri/common/dri_drmpool.c | 221
src/mesa/drivers/dri/common/dri_util.c | 12
src/mesa/drivers/dri/common/dri_util.h | 8
src/mesa/drivers/dri/common/extension_helper.h | 38
src/mesa/drivers/dri/glcore/Makefile | 6
src/mesa/drivers/dri/i915/Makefile | 46
src/mesa/drivers/dri/i915/i830_context.c | 90
src/mesa/drivers/dri/i915/i830_context.h | 139
src/mesa/drivers/dri/i915/i830_metaops.c | 990 ---
src/mesa/drivers/dri/i915/i830_reg.h | 18
src/mesa/drivers/dri/i915/i830_state.c | 910 +-
src/mesa/drivers/dri/i915/i830_tex.c | 296
src/mesa/drivers/dri/i915/i830_texblend.c | 364 -
src/mesa/drivers/dri/i915/i830_texstate.c | 567 -
src/mesa/drivers/dri/i915/i830_vtbl.c | 543 +
src/mesa/drivers/dri/i915/i915_context.c | 138
src/mesa/drivers/dri/i915/i915_context.h | 190
src/mesa/drivers/dri/i915/i915_debug.c | 187
src/mesa/drivers/dri/i915/i915_fragprog.c | 1415 ++--
src/mesa/drivers/dri/i915/i915_metaops.c | 679 --
src/mesa/drivers/dri/i915/i915_program.c | 336 -
src/mesa/drivers/dri/i915/i915_program.h | 97
src/mesa/drivers/dri/i915/i915_reg.h | 176
src/mesa/drivers/dri/i915/i915_state.c | 755 +-
src/mesa/drivers/dri/i915/i915_tex.c | 122
src/mesa/drivers/dri/i915/i915_tex_layout.c | 380 +
src/mesa/drivers/dri/i915/i915_texprog.c | 671 --
src/mesa/drivers/dri/i915/i915_texstate.c | 1013 ---
src/mesa/drivers/dri/i915/i915_vtbl.c | 524 +
src/mesa/drivers/dri/i915/intel_batchbuffer.c | 898 --
src/mesa/drivers/dri/i915/intel_batchbuffer.h | 211
src/mesa/drivers/dri/i915/intel_batchpool.c | 416 +
src/mesa/drivers/dri/i915/intel_blit.c | 516 +
src/mesa/drivers/dri/i915/intel_blit.h | 63
src/mesa/drivers/dri/i915/intel_buffer_objects.c | 250
src/mesa/drivers/dri/i915/intel_buffer_objects.h | 86
src/mesa/drivers/dri/i915/intel_buffers.c | 968 +++
src/mesa/drivers/dri/i915/intel_buffers.h | 56
src/mesa/drivers/dri/i915/intel_context.c | 916 +-
src/mesa/drivers/dri/i915/intel_context.h | 462 -
src/mesa/drivers/dri/i915/intel_depthstencil.c | 282
src/mesa/drivers/dri/i915/intel_depthstencil.h | 14
src/mesa/drivers/dri/i915/intel_fbo.c | 621 ++
src/mesa/drivers/dri/i915/intel_fbo.h | 80
src/mesa/drivers/dri/i915/intel_ioctl.c | 626 --
src/mesa/drivers/dri/i915/intel_ioctl.h | 45
src/mesa/drivers/dri/i915/intel_mipmap_tree.c | 341 +
src/mesa/drivers/dri/i915/intel_mipmap_tree.h | 198
src/mesa/drivers/dri/i915/intel_pixel.c | 512 -
src/mesa/drivers/dri/i915/intel_pixel.h | 63
src/mesa/drivers/dri/i915/intel_pixel_copy.c | 380 +
src/mesa/drivers/dri/i915/intel_pixel_draw.c | 365 +
src/mesa/drivers/dri/i915/intel_pixel_read.c | 317 +
src/mesa/drivers/dri/i915/intel_regions.c | 458 +
src/mesa/drivers/dri/i915/intel_regions.h | 142
src/mesa/drivers/dri/i915/intel_render.c | 104
src/mesa/drivers/dri/i915/intel_rotate.c | 56
src/mesa/drivers/dri/i915/intel_rotate.h | 6
src/mesa/drivers/dri/i915/intel_screen.c | 621 +-
src/mesa/drivers/dri/i915/intel_screen.h | 81
src/mesa/drivers/dri/i915/intel_span.c | 477 +
src/mesa/drivers/dri/i915/intel_span.h | 11
src/mesa/drivers/dri/i915/intel_state.c | 430 -
src/mesa/drivers/dri/i915/intel_tex.c | 935 ---
src/mesa/drivers/dri/i915/intel_tex.h | 103
src/mesa/drivers/dri/i915/intel_tex_copy.c | 291
src/mesa/drivers/dri/i915/intel_tex_format.c | 146
src/mesa/drivers/dri/i915/intel_tex_image.c | 626 ++
src/mesa/drivers/dri/i915/intel_tex_subimage.c | 183
src/mesa/drivers/dri/i915/intel_tex_validate.c | 253
src/mesa/drivers/dri/i915/intel_texmem.c | 72
src/mesa/drivers/dri/i915/intel_tris.c | 773 +-
src/mesa/drivers/dri/i915/intel_tris.h | 29
src/mesa/drivers/dri/r200/r200_context.h | 2
src/mesa/drivers/dri/r200/r200_vertprog.c | 27
src/mesa/drivers/dri/r300/r300_cmdbuf.c | 53
src/mesa/drivers/dri/r300/r300_context.h | 6
src/mesa/drivers/dri/r300/r300_emit.h | 361 -
src/mesa/drivers/dri/r300/r300_fragprog.c | 8
src/mesa/drivers/dri/r300/r300_ioctl.c | 16
src/mesa/drivers/dri/r300/r300_program.h | 2
src/mesa/drivers/dri/r300/r300_render.c | 23
src/mesa/drivers/dri/r300/r300_shader.c | 20
src/mesa/drivers/dri/r300/r300_state.c | 10
src/mesa/drivers/dri/r300/r300_vertexprog.c | 8
src/mesa/drivers/dri/r300/radeon_mm.c | 4
src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c | 21
src/mesa/drivers/fbdev/glfbdev.c | 31
src/mesa/drivers/windows/gdi/wmesa.c | 2
src/mesa/glapi/gl_API.xml | 32
src/mesa/main/attrib.c | 2
src/mesa/main/blend.c | 17
src/mesa/main/buffers.c | 14
src/mesa/main/buffers.h | 2
src/mesa/main/context.c | 4
src/mesa/main/context.h | 88
src/mesa/main/dd.h | 10
src/mesa/main/enable.c | 16
src/mesa/main/enums.c | 4749 +++++++--------
src/mesa/main/fbobject.c | 25
src/mesa/main/getstring.c | 5
src/mesa/main/imports.h | 16
src/mesa/main/mtypes.h | 38
src/mesa/main/state.c | 21
src/mesa/main/texenvprogram.c | 17
src/mesa/main/teximage.c | 30
src/mesa/main/texstate.c | 10
src/mesa/main/texstore.c | 753 +-
src/mesa/shader/arbprogparse.c | 6
src/mesa/shader/arbprogparse.h | 4
src/mesa/shader/arbprogram.c | 14
src/mesa/shader/nvfragparse.c | 10
src/mesa/shader/nvfragparse.h | 4
src/mesa/shader/nvprogram.c | 48
src/mesa/shader/nvvertexec.c | 2
src/mesa/shader/nvvertexec.h | 2
src/mesa/shader/nvvertparse.c | 4
src/mesa/shader/nvvertparse.h | 4
src/mesa/shader/program.c | 84
src/mesa/shader/program.h | 42
src/mesa/shader/shaderobjects.c | 4
src/mesa/shader/shaderobjects.h | 18
src/mesa/shader/shaderobjects_3dlabs.c | 112
src/mesa/shader/shaderobjects_3dlabs.h | 7
src/mesa/shader/slang/library/syn_to_c.c | 72
src/mesa/swrast/s_arbshader.c | 149
src/mesa/swrast/s_arbshader.h | 4
src/mesa/swrast/s_context.c | 26
src/mesa/swrast/s_nvfragprog.c | 14
src/mesa/swrast/s_span.c | 20
src/mesa/swrast/s_triangle.c | 4
src/mesa/tnl/t_array_import.c | 2
src/mesa/tnl/t_context.h | 7
src/mesa/tnl/t_pipeline.h | 2
src/mesa/tnl/t_vb_arbprogram.c | 12
src/mesa/tnl/t_vb_arbprogram.h | 4
src/mesa/tnl/t_vb_arbshader.c | 4
src/mesa/tnl/t_vb_cliptmp.h | 6
src/mesa/tnl/t_vb_program.c | 2
src/mesa/tnl/t_vp_build.c | 16
src/mesa/tnl/t_vtx_api.c | 4
src/mesa/tnl/t_vtx_eval.c | 41
src/mesa/tnl/tnl.h | 2
src/mesa/tnl_dd/t_dd_dmatmp.h | 23
src/mesa/tnl_dd/t_dd_dmatmp2.h | 13
src/mesa/tnl_dd/t_dd_unfilled.h | 13
windows/VC6/mesa/mesa/mesa.dsp | 8
windows/VC7/mesa/mesa/mesa.vcproj | 3
270 files changed, 30835 insertions(+), 14336 deletions(-)
---
More information about the Xquartz-changes
mailing list