[Xquartz-changes] mesa: Changes to 'refs/tags/texman_0_1_20060325'
Jeremy Huddleston
jeremyhu at freedesktop.org
Thu Jan 1 01:06:58 PST 2015
Tag 'texman_0_1_20060325' created by Brian Paul <brian.paul at tungstengraphics.com> at 1970-01-01 00:00 -0800
Changes since mesa_texman_20060210:
Brian Paul (126):
initial skeletons for GL_EXT_framebuffer_object
just comments, doxygen
Replace code like this:
added some assertions as prep to removing use of dPriv fields. new comments.
init Red/Green/EtcBits = 0 in soft_renderbuffer_storage()
Added BindFramebuffer() driver hook.
include intel_fbo
comments
new intel_set_span_functions(), bridge to new code
allow format = GL_RGB5, GL_RGBA8
new intel_map_unmap_buffers() routine which will eventually be used to map or unmap all renderbuffers which we may need during software rendering
new intel_renderbuffer struct
fix more assertions that wrap essential code (-DNDEBUG case)
added GL_EXT_framebuffer_blit from trunk
sync with trunk
New code for setting cliprects when rendering to a FBO.
just check-point some FBO code
checkpoint
make soft_renderbuffer_storage() into public _mesa_soft_renderbuffer_storage()
update assertion
thread safety fixes from trunk
added ImageStride field to gl_texture_image
remove some const qualifiers since we may need to modify fields for mapping
Implement glGetTexImage.
Change loops from firstLevel to lastLevel to be inclusive of lastLevel
Call _mesa_resize_framebuffer() in intelWindowMoved() to update Mesa's
Don't call Driver->Bitmap() if no image to render
Checkpoint FBO work:
FBO Checkpoint:
sync with trunk (GL_READ/DRAW_BUFFER queries)
added BUFFER_BITS_COLOR
intelClearWithTriangles now handles FBOs.
undo a debugging hack
Merge i915_set_draw_region() and i915 meta_draw_region() into new i915_state_draw_region().
simplify intelClearWithTris() for renderbuffers
remove debug code
Fix some issues with depth renderbuffers. 3D rendering into FBOs seems OK now.
FBO test - teapot
added _mesa_clip_to_region()
Replace intel_clip_to_framebuffer(), intel_clip_to_drawable(), and
merge from trunk (additional renderbuffer error checks, debug code)
Fix up intelSwapBuffers:
In intelCopyBuffer(), use renderbuffer regions instead of context's region
XXX comments
Fixed bug in intelClearWithBlit(). If clearing multiple cliprects, the
Merge from CVS trunk (get render-to-texture updates).
updates to sync with trunk merge
update get_teximage_source() to use renderbuffer regions
Checkpoint render-to-texture. Doesn't function, but doesn't crash either.
debug code to enable/disable depth/stencil operations
Checkpoint: render-to-texture starting to work. Had to turn off stencil
fix up some loose ends for render to texture, clean-ups
use correct renderbuffer regions in intelClearWithTris()
Created new intel_buffers.h file with appropriate prototypes.
Added _mesa_finish_render_texture() function and reference counting for
Additional login in intel_draw_buffer() to check if any needed renderbuffers
include intel_buffers.h
In intelReadBuffer() check/update framebuffer completeness.
comments, #if 0 / #endif some apparently unused context fields
Need to set hardware viewport params depending on window vs. FBO rendering
When s/w rendering to texture memory, don't invert Y as for regular rendering.
GL_EXT_packed_depth_stencil should be off by default
fix token in assertion
added -DDEBUG so core mesa debug/ASSERT code is activated (temporary on this branch)
A number of renderbuffer changes:
Lots of updates for new gl_renderbuffer ClassID and _ActualFormat fields.
Reorganize the code relating to updating the framebuffer's _DepthBuffer
New _mesa_lookup_texture() function to wrap the hashtable lookup.
Export _mesa_lookup_renderbuffer() and _mesa_lookup_framebuffer() functions.
New functions for manipulating depth/stencil renderbuffers:
fix some _ActualFormat initializations
remove unused var
minor clean-up
Call check_begin/end_render_texture() whenever the framebuffer binding
Fix a number of issues in the _mesa_extract/insert_stencil() functions.
Support for separate depth and stencil renderbuffers.
remove some invalid assertions (storage may not yet be allocated for the renderbuffer)
assertion fixes
Merge from trunk (get RENDER_START, clip code movement)
need an AllocStorage function for resizes
need to resize the depth/stencil wrappers, if present, in _mesa_resize_framebuffer()
Rendering to FBO w/ stencil but w/out depth works now.
fix a test in intel_validate_paired_depth_stencil(), fixes a 16bpp bug
fix 16bpp bug
use intel_region_reference() in MakeCurrent to make sure we don't accidentally lose the screen->front/back/depth regions
assert(refcount > 0) in intel_region_release() - helpful for finding refernces to free'd memory
Only try to validate depth/stencil pairing for user-created FBOs.
Before calling intel_region_release/reference() check if the regions
Initial attempt at software fallback for rendering to a hardware texture
In intelClearColor() always compute both 16bpp and 32bpp clear values
Comment about removing screen->fbFormat field in the future.
Combine the bodies of _mesa_FramebufferTexture1D/2D/3DEXT into a single
INTEL_PACKCOLOR() no longer needed
move prevLockFile/Line into context struct
In intelCopyBuffer() use current context, not dPriv->driContextPriv->driverPrivate.
tweak to render-to-texture region code
added render/framebuffer locking for thread safety
Added an intelFlush() call inside intel_bind_framebuffer() to be sure
check for NULL rb in _mesa_framebuffer_renderbuffer()
fix some mapping bugs
another intelFlush() call
just comments
some comments
more fixes and clean-up in intelCopyBuffer()
minor clean-ups
update i915/i830Scissor to use DrawBuffer instead of driDrawable bounds
no need to pass ctx to _mesa_clip_to_region()
update scissor at end of intel_draw_buffer()
better switch cases
added some missing formats in _mesa_source/dest_buffer_exists()
In i915/i830_update_tex_unit() get the firstImage pointer _after_ we've called
merge from trunk
s/inline/INLINE/ to allow use of -ansi flag with gcc.
remove stray semicolon
silence several -pedantic warnings
Replace _mesa_destroy_context() with _mesa_free_context_data() because ctx
unlock mutex before freeing data (caught w/ valgrind)
Check for incomplete framebuffer in _mesa_Clear()
check if copying from FBO, adjust x, y accordingly
Implement rendering to textures for any mipmap level, any cube face, any
comments
fix a couple issues in _mesa_free_framebuffer_data()
Implement software fallback for render-to-texture when the texture format
Shorten ctx->Driver.RenderbufferTexture to ctx->Driver.RenderTexture since
merge from trunk
remove some unneeded code
Keith Whitwell (57):
move blit functions to new file
Some functions had been indented by one space?!
Fix inverted image in copytexsubimage by tickling the hardware to
bump driver date, etc
rename texdown to reflect behaviour changes
tweaks
Introduce fixup/relocation lists for dma buffers.
restore swapbuffers throttling
Append an MI_FLUSH to each batchbuffer for synchronization. Not really
Fix cubemap layout
get 3d textures working again
Remove dead code
Fix clipping for copypixel
Add a callback to set post-fragment state in the metaops utility.
Flush old primitive before starting new one in intelRasterPrimitive.
Add an assert
Define union fi, reenable clear-with-tris.
bufferobjects implementation layered on top of bm buffers
Bring DBG_BM() macros back to DBG(). Turn on by setting
Hook up buffer_objects implementation to DrawPixels for testing.
Hack bmBufferData and bmBufferSubdata back into operation with an
add bmBufferGetSubData
Add missing GetSubData callback.
use expected argument order for intel_check_blit_format
Get PBO drawpixels working.
get PBO readpixels working also
Tweak the read format/type slightly so this can use the blitter.
a few missed cases where blits can't do read/drawpixels
fix misleading MI_FLUSH defn and usage
For some reason, streaming copies to write-combined regions are
First pass at using the texture engine for copypixels. Currently only
Use spantmp2.h, based on r200 driver.
Make this struct less opaque.
- Use a raw buffer id rather than an intel_region struct for texture
Fix logic for calculating regions for partial-buffer clears.
Fix drawpixels window coordinate calculation.
Texture copypixels, fixes to blit path also.
Remove the flags argument for intel_meta_draw_quad(). 3D primitives
Port the i830 driver to the texture manager. Compiles but not tested.
i830 driver first triangles (with a faked out bufmgr)
Get basic texturing and stencil working
Get texture drawpixels working
Add copypix.c demo.
Use braces around size parameter in BEGIN_BATCH. Hopefully fixes
Check to see if a bufmgr has already been created for the current drm
Use drmCloseOnce()
drmOpen/Close hacks to coalesce multiple drm opens
reinstate old unlock + sched_yeild behaviour when nr_cliprects == 0
Turn the render stage back on.
Clear optimizations.
Call _mesa_update_state() before checking FragmentProgram->_Enabled
Remove old DRM_SOURCE_PATH defn
Restore animation
Use an rgba image so that hw pbos work.
Protect depth buffer emit with test for state->depth_region
Add a few assertions, currently hit by fgl_glxgears
Use 64 byte-aligned pitches for RBO's
Thomas Hellström (12):
Hack bufmgr_fake to allocate from ttms when possible.
Enable uncached TTMs by default.
Call kernel to update the sarea breadcrumb when we seem to be out of
Silence printout and nicer wait for IRQ when out of batchbuffer mem.
Add a define NO_TTM to disable ttm usage altogether for comparison.
Add bufmgr_old that keeps the old pre-ttm functionality.
Move over to libdrm.
New libdrm flag numbers.
Remove wait for fence at the end of intelFlush.
Clean up flag handling.
Verbose error reporting.
Disable texture memory initialization.
---
configs/default | 3
configs/linux-dri | 5
include/GL/gl.h | 22
progs/demos/Makefile | 4
progs/demos/copypix.c | 364
progs/demos/drawpix_pbo.c | 376
progs/demos/texdown-pool.c | 490 +
progs/demos/texdown.c | 490 -
progs/demos/texobj.c | 2
progs/tests/Makefile | 1
progs/tests/fbotest2.c | 204
progs/tests/fbotexture.c | 20
progs/tests/pbo.c | 6
progs/tests/subtexrate.c | 74
src/glx/x11/glxclient.h | 11
src/glx/x11/glxext.c | 69
src/mesa/drivers/common/driverfuncs.c | 7
src/mesa/drivers/dri/common/dri_util.c | 2
src/mesa/drivers/dri/common/drirenderbuffer.c | 6
src/mesa/drivers/dri/i915/Makefile | 33
src/mesa/drivers/dri/i915/bufmgr.h | 166
src/mesa/drivers/dri/i915/bufmgr_fake.c | 867 --
src/mesa/drivers/dri/i915/i830_context.c | 39
src/mesa/drivers/dri/i915/i830_context.h | 94
src/mesa/drivers/dri/i915/i830_metaops.c | 707 -
src/mesa/drivers/dri/i915/i830_reg.h | 4
src/mesa/drivers/dri/i915/i830_state.c | 113
src/mesa/drivers/dri/i915/i830_tex.c | 256
src/mesa/drivers/dri/i915/i830_texblend.c | 10
src/mesa/drivers/dri/i915/i830_texstate.c | 554 -
src/mesa/drivers/dri/i915/i830_vtbl.c | 150
src/mesa/drivers/dri/i915/i915_context.c | 55
src/mesa/drivers/dri/i915/i915_context.h | 71
src/mesa/drivers/dri/i915/i915_fragprog.c | 14
src/mesa/drivers/dri/i915/i915_metaops.c | 412 -
src/mesa/drivers/dri/i915/i915_program.c | 10
src/mesa/drivers/dri/i915/i915_program.h | 8
src/mesa/drivers/dri/i915/i915_reg.h | 14
src/mesa/drivers/dri/i915/i915_state.c | 126
src/mesa/drivers/dri/i915/i915_tex.c | 2
src/mesa/drivers/dri/i915/i915_tex_layout.c | 84
src/mesa/drivers/dri/i915/i915_texprog.c | 12
src/mesa/drivers/dri/i915/i915_texstate.c | 49
src/mesa/drivers/dri/i915/i915_vtbl.c | 247
src/mesa/drivers/dri/i915/intel_batchbuffer.c | 572 -
src/mesa/drivers/dri/i915/intel_batchbuffer.h | 210
src/mesa/drivers/dri/i915/intel_blit.c | 437 +
src/mesa/drivers/dri/i915/intel_blit.h | 60
src/mesa/drivers/dri/i915/intel_buffer_objects.c | 201
src/mesa/drivers/dri/i915/intel_buffer_objects.h | 70
src/mesa/drivers/dri/i915/intel_buffers.c | 730 +
src/mesa/drivers/dri/i915/intel_buffers.h | 58
src/mesa/drivers/dri/i915/intel_bufmgr.c | 444 +
src/mesa/drivers/dri/i915/intel_bufmgr.h | 132
src/mesa/drivers/dri/i915/intel_context.c | 426 -
src/mesa/drivers/dri/i915/intel_context.h | 226
src/mesa/drivers/dri/i915/intel_depthstencil.c | 281
src/mesa/drivers/dri/i915/intel_depthstencil.h | 13
src/mesa/drivers/dri/i915/intel_fbo.c | 638 +
src/mesa/drivers/dri/i915/intel_fbo.h | 75
src/mesa/drivers/dri/i915/intel_ioctl.c | 313
src/mesa/drivers/dri/i915/intel_ioctl.h | 27
src/mesa/drivers/dri/i915/intel_mipmap_tree.c | 121
src/mesa/drivers/dri/i915/intel_mipmap_tree.h | 28
src/mesa/drivers/dri/i915/intel_pixel.c | 631 -
src/mesa/drivers/dri/i915/intel_pixel.h | 64
src/mesa/drivers/dri/i915/intel_pixel_copy.c | 346
src/mesa/drivers/dri/i915/intel_pixel_draw.c | 358
src/mesa/drivers/dri/i915/intel_pixel_read.c | 315
src/mesa/drivers/dri/i915/intel_regions.c | 188
src/mesa/drivers/dri/i915/intel_regions.h | 28
src/mesa/drivers/dri/i915/intel_render.c | 26
src/mesa/drivers/dri/i915/intel_screen.c | 120
src/mesa/drivers/dri/i915/intel_screen.h | 5
src/mesa/drivers/dri/i915/intel_span.c | 414 -
src/mesa/drivers/dri/i915/intel_span.h | 4
src/mesa/drivers/dri/i915/intel_state.c | 226
src/mesa/drivers/dri/i915/intel_tex.c | 3
src/mesa/drivers/dri/i915/intel_tex.h | 40
src/mesa/drivers/dri/i915/intel_tex_copy.c | 151
src/mesa/drivers/dri/i915/intel_tex_format.c | 2
src/mesa/drivers/dri/i915/intel_tex_image.c | 139
src/mesa/drivers/dri/i915/intel_tex_subimage.c | 54
src/mesa/drivers/dri/i915/intel_tex_validate.c | 132
src/mesa/drivers/dri/i915/intel_tris.c | 385 -
src/mesa/drivers/dri/i915/intel_tris.h | 19
src/mesa/glapi/Makefile | 25
src/mesa/glapi/dispatch.h | 9
src/mesa/glapi/glX_proto_common.py | 4
src/mesa/glapi/glX_proto_recv.py | 561 +
src/mesa/glapi/glX_proto_send.py | 2
src/mesa/glapi/gl_API.xml | 23
src/mesa/glapi/gl_enums.py | 4
src/mesa/glapi/gl_procs.py | 2
src/mesa/glapi/glapi.c | 79
src/mesa/glapi/glapi.h | 38
src/mesa/glapi/glapioffsets.h | 4
src/mesa/glapi/glapitable.h | 1
src/mesa/glapi/glapitemp.h | 6
src/mesa/glapi/glprocs.h | 358
src/mesa/glapi/mesadef.py | 3
src/mesa/glapi/typeexpr.py | 42
src/mesa/main/accum.c | 4
src/mesa/main/api_arrayelt.c | 54
src/mesa/main/attrib.c | 8
src/mesa/main/buffers.c | 12
src/mesa/main/context.c | 71
src/mesa/main/dd.h | 16
src/mesa/main/depthstencil.c | 262
src/mesa/main/depthstencil.h | 19
src/mesa/main/dlist.c | 5367 +++++++-------
src/mesa/main/dlist.h | 21
src/mesa/main/drawpix.c | 110
src/mesa/main/enable.c | 46
src/mesa/main/enums.c | 4079 +++++-----
src/mesa/main/execmem.c | 3
src/mesa/main/extensions.c | 22
src/mesa/main/fbobject.c | 461 -
src/mesa/main/fbobject.h | 12
src/mesa/main/fog.c | 35
src/mesa/main/framebuffer.c | 433 -
src/mesa/main/framebuffer.h | 17
src/mesa/main/get.c | 1319 +--
src/mesa/main/get_gen.py | 462 -
src/mesa/main/glheader.h | 5
src/mesa/main/image.c | 42
src/mesa/main/image.h | 7
src/mesa/main/imports.c | 47
src/mesa/main/imports.h | 39
src/mesa/main/light.c | 19
src/mesa/main/mtypes.h | 65
src/mesa/main/renderbuffer.c | 159
src/mesa/main/renderbuffer.h | 5
src/mesa/main/state.c | 8
src/mesa/main/texenvprogram.c | 9
src/mesa/main/teximage.c | 110
src/mesa/main/texobj.c | 162
src/mesa/main/texobj.h | 7
src/mesa/main/texrender.c | 63
src/mesa/main/texrender.h | 11
src/mesa/main/texstate.c | 172
src/mesa/main/texstore.c | 83
src/mesa/main/texstore.h | 4
src/mesa/shader/arbprogparse.c | 3
src/mesa/shader/nvfragparse.c | 1
src/mesa/shader/nvvertparse.c | 6
src/mesa/shader/program.c | 19
src/mesa/shader/shaderobjects.c | 1321 +--
src/mesa/shader/shaderobjects.h | 11
src/mesa/shader/shaderobjects_3dlabs.c | 656 +
src/mesa/shader/shaderobjects_3dlabs.h | 24
src/mesa/shader/slang/descrip.mms | 19
src/mesa/shader/slang/library/slang_common_builtin.gc | 2223 ++---
src/mesa/shader/slang/library/slang_common_builtin_gc.h | 1324 +--
src/mesa/shader/slang/library/slang_core.gc | 1164 +--
src/mesa/shader/slang/library/slang_core_gc.h | 1037 +-
src/mesa/shader/slang/library/slang_fragment_builtin.gc | 422 -
src/mesa/shader/slang/library/slang_fragment_builtin_gc.h | 146
src/mesa/shader/slang/library/slang_shader.syn | 95
src/mesa/shader/slang/library/slang_shader_syn.h | 52
src/mesa/shader/slang/library/slang_vertex_builtin.gc | 292
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | 144
src/mesa/shader/slang/slang_analyse.c | 100
src/mesa/shader/slang/slang_analyse.h | 50
src/mesa/shader/slang/slang_assemble.c | 1624 ++--
src/mesa/shader/slang/slang_assemble.h | 138
src/mesa/shader/slang/slang_assemble_assignment.c | 183
src/mesa/shader/slang/slang_assemble_assignment.h | 13
src/mesa/shader/slang/slang_assemble_conditional.c | 581 -
src/mesa/shader/slang/slang_assemble_conditional.h | 34
src/mesa/shader/slang/slang_assemble_constructor.c | 338
src/mesa/shader/slang/slang_assemble_constructor.h | 58
src/mesa/shader/slang/slang_assemble_typeinfo.c | 537 -
src/mesa/shader/slang/slang_assemble_typeinfo.h | 89
src/mesa/shader/slang/slang_compile.c | 2119 ++---
src/mesa/shader/slang/slang_compile.h | 239
src/mesa/shader/slang/slang_compile_function.c | 190
src/mesa/shader/slang/slang_compile_function.h | 84
src/mesa/shader/slang/slang_compile_operation.c | 102
src/mesa/shader/slang/slang_compile_operation.h | 117
src/mesa/shader/slang/slang_compile_struct.c | 178
src/mesa/shader/slang/slang_compile_struct.h | 61
src/mesa/shader/slang/slang_compile_variable.c | 369
src/mesa/shader/slang/slang_compile_variable.h | 93
src/mesa/shader/slang/slang_execute.c | 364
src/mesa/shader/slang/slang_execute.h | 31
src/mesa/shader/slang/slang_execute_x86.c | 546 +
src/mesa/shader/slang/slang_export.c | 341
src/mesa/shader/slang/slang_export.h | 141
src/mesa/shader/slang/slang_library_noise.c | 501 +
src/mesa/shader/slang/slang_library_noise.h | 42
src/mesa/shader/slang/slang_library_texsample.c | 142
src/mesa/shader/slang/slang_library_texsample.h | 44
src/mesa/shader/slang/slang_link.c | 437 +
src/mesa/shader/slang/slang_link.h | 195
src/mesa/shader/slang/slang_preprocess.c | 5
src/mesa/shader/slang/slang_preprocess.h | 6
src/mesa/shader/slang/slang_storage.c | 202
src/mesa/shader/slang/slang_storage.h | 106
src/mesa/shader/slang/slang_utility.c | 87
src/mesa/shader/slang/slang_utility.h | 43
src/mesa/sources | 15
src/mesa/swrast/descrip.mms | 18
src/mesa/swrast/s_arbshader.c | 99
src/mesa/swrast/s_arbshader.h | 34
src/mesa/swrast/s_atifragshader.c | 5
src/mesa/swrast/s_blit.c | 790 ++
src/mesa/swrast/s_context.c | 16
src/mesa/swrast/s_context.h | 27
src/mesa/swrast/s_drawpix.c | 22
src/mesa/swrast/s_readpix.c | 20
src/mesa/swrast/s_span.c | 31
src/mesa/swrast/s_texstore.c | 3
src/mesa/swrast/swrast.h | 6
src/mesa/tnl/descrip.mms | 11
src/mesa/tnl/t_pipeline.c | 7
src/mesa/tnl/t_pipeline.h | 5
src/mesa/tnl/t_vb_arbprogram.c | 40
src/mesa/tnl/t_vb_arbprogram_sse.c | 56
src/mesa/tnl/t_vb_arbshader.c | 262
src/mesa/tnl/t_vb_cull.c | 7
src/mesa/tnl/t_vb_fog.c | 5
src/mesa/tnl/t_vb_light.c | 10
src/mesa/tnl/t_vb_normals.c | 9
src/mesa/tnl/t_vb_points.c | 5
src/mesa/tnl/t_vb_program.c | 7
src/mesa/tnl/t_vb_texgen.c | 10
src/mesa/tnl/t_vb_texmat.c | 7
src/mesa/tnl/t_vb_vertex.c | 7
src/mesa/x86-64/glapi_x86-64.S | 53
src/mesa/x86/glapi_x86.S | 1
src/mesa/x86/rtasm/x86sse.c | 83
src/mesa/x86/rtasm/x86sse.h | 32
233 files changed, 31053 insertions(+), 20115 deletions(-)
---
More information about the Xquartz-changes
mailing list