aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_context.c
Commit message (Collapse)AuthorAgeFilesLines
* intel: Merge intel_context.c from i915 and i965.Kristian Høgsberg2008-02-221-831/+1
|
* Merge {i915,i965}/intel_context.h as intel/intel_context.hKristian Høgsberg2008-02-221-1/+2
|
* Use drm_i915_sarea instead of drmI830Sarea and remove i830_common.hAlan Hourihane2008-02-221-9/+8
|
* [965] Fix ARB_occlusion_query from intel_screen.c merge.Eric Anholt2008-02-131-3/+5
| | | | | It wasn't being initialized at screen setup, so we were getting stub entrypoints even though it was exposed as enabled. Fixes arbocclude mesa demo.
* i965: fix potential NULL pointer dereference. The third regionXiang, Haihao2008-02-031-0/+3
| | | | isn't created at all for 965
* i965: new integrated graphics chipset supportXiang, Haihao2008-01-291-0/+3
|
* [intel] Make the no_rast option be standard driconf instead of INTEL_NO_RAST.Eric Anholt2008-01-171-1/+1
|
* [intel] Add more cliprect modes to cover other meanings for batch emits.Eric Anholt2008-01-101-0/+6
| | | | | | | | | | | | | | | The previous change gave us only two modes, one which looped over the batch per cliprect (3d drawing) and one that didn't (state updeast). However, we really want 4: - Batch doesn't care about cliprects (state updates) - Batch needs DRAWING_RECTANGLE looping per cliprect (3d drawing) - Batch needs to be executed just once (region fills, copies, etc.) - Batch already includes cliprect handling, and must be flushed by unlock time (copybuffers, clears). All callers should now be fixed to use one of these states for any batchbuffer emits. Thanks to Keith Whitwell for pointing out the failure.
* i965: fix segfault caused by commit e131c46b20241737ceba4856dbe01dcca6dd2c03.Xiang, Haihao2008-01-101-15/+15
|
* [intel] Rename lost_hardware vtbl entry to new_batch.Eric Anholt2008-01-091-1/+0
| | | | | | | Both drivers have ended up relying on lost_hardware being called after each batch buffer, so update the name. This removes one of the calls on 965 whic h was outside of the batchbuffer handling code and just duplicating what had already happened through batchbuffer handling.
* [intel] Remove the dead intel->need_flush member.Eric Anholt2008-01-091-1/+0
|
* [965] Fix and enable separate stencil.Eric Anholt2007-12-211-0/+8
| | | | | | Note that this does not enable GL_EXT_stencil_two_side, because Mesa's computed _TestTwoSide ends up respecting only STENCIL_TEST_TWO_SIDE_EXT (defaults to GL_FALSE), even if the application uses only GL 2.0 / ATI entrypoints.
* [965] Enable EXT_framebuffer_object.Eric Anholt2007-12-201-15/+49
| | | | | To do so, merge the remainnig necessary code from the buffers, blit, span, and screen code to shared, and replace it with those.
* [965] Actually enable SGIS_generate_mipmap.Eric Anholt2007-12-201-1/+1
|
* [965] Replace our own depth constants in intel context with GL context ones.Eric Anholt2007-12-171-7/+0
|
* [965] Enable ARB_pixel_buffer_object, and disable broken imaging extension.Eric Anholt2007-12-161-5/+23
| | | | While I haven't tested the imaging extension, this matches what 915 does.
* [965] Move to using shared texture management code.Eric Anholt2007-12-161-1/+1
| | | | | | This removes the delayed texture upload optimization from 965, in exchange for bringing us closer to PBO support. It also disables SGIS_generate_mipmap, which didn't seem to be working before anyway, according to the lodbias demo.
* [965] Use shared intel_regions.c.Eric Anholt2007-12-151-4/+4
| | | | | This adds (so far) unused PBO functions, and holding the lock while writing to regions (which may be shared static screen regions).
* [intel] Enable INTEL_DEBUG=bufmgr output in TTM mode as well as classic.Eric Anholt2007-12-131-2/+2
|
* [intel] Move bufmgr back to context instead of screen, fixing glthreads.Eric Anholt2007-12-121-30/+98
| | | | | | | | Putting the bufmgr in the screen is not thread-safe since the emit_reloc changes. It also led to a significant performance hit from pthread usage for the attempted thread-safety (up to 12% of a cpu spent on refcounting protection in single-threaded 965). The motivation had been to allow multi-context bufmgr sharing in classic mode, but it wasn't worth the cost.
* [965] Hook up DEBUG_BUFMGR output for bufmgr_fake.Eric Anholt2007-12-101-0/+2
|
* [965] Convert the driver to dri_bufmgr interface and enable TTM.Eric Anholt2007-12-071-94/+51
| | | | | | | | | | | | | This is currently believed to work but be a significant performance loss. Performance recovery should be soon to follow. The dri_bo_fake_disable_backing_store() call was added to allow backing store disable like bufmgr_fake.c did, which is a significant performance win (though it's missing the no-fence-subdata part). This commit is a squash merge of the 965-ttm branch, which had some history I wanted to avoid pulling due to noisiness and brokenness at many points for git-bisecting.
* [965] Convert DBG macro to use FILE_DEBUG_FLAG like i915.Eric Anholt2007-11-191-2/+11
|
* More vblank cleanups.Michel Dänzer2007-10-301-5/+7
| | | | | | | | * Fix crash at context creation in most drivers supporting vblank. * Don't pass vblank sequence or flags to functions that get passed the drawable private already. * Attempt to initialize vblank related drawable private fields just once per drawable. May need more work in some drivers.
* Refactor and fix core vblank supportJesse Barnes2007-10-291-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate support for synchronizing to and retrieving vblank counters. Also fix the core vblank code to return monotonic MSC counters, which are required by some GLX extensions. Adding support for multiple pipes to a low level driver is fairly easy, the Intel 965 driver provides simple example code (see intel_buffers.c:intelWindowMoved()). The new code bumps the media stream counter extension version to 2 and adds a new getDrawableMSC callback. This callback takes a drawablePrivate pointer, which is used to calculate the MSC value seen by clients based on the actual vblank counter(s) returned from the kernel. The new drawable private fields are as follows: - vblSeq - used for tracking vblank counts for buffer swapping - vblFlags - flags (e.g. current pipe), updated by low level driver - msc_base - MSC counter from the last time the current pipe changed - vblank_base - kernel DRM vblank counter from the last time the pipe changed Using the above variables, the core vblank code (in vblank.c) can calculate a monotonic MSC value. The low level DRI drivers are responsible for updating the current pipe (by setting VBLANK_FLAG_SECONDARY for example in vblFlags) along with msc_base and vblank_base whenever the pipe associated with a given drawable changes (again, see intelWindowMoved for an example of this). Drivers should fill in the GetDrawableMSC DriverAPIRec field to point to driDrawableGetMSC32 and add code for pipe switching as outlined above to fully support the new scheme.
* Merge branch '965-glsl'Zou Nan hai2007-10-261-0/+14
|\ | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_sf.h src/mesa/drivers/dri/i965/intel_context.c
| * Non Square MatrixZou Nan hai2007-10-091-0/+2
| |
| * ARB_shader_object ARB_vertex_shader ARB_fragment_shader in 965-glsl branchZou Nan hai2007-09-181-0/+6
| |
| * fix double free in 965-glsl branchZou Nan hai2007-09-181-0/+2
| |
| * Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵Zou Nan hai2007-07-041-5/+8
| |\ | | | | | | | | | into 965-glsl
| * | Initial 965 GLSL supportZou Nan hai2007-04-121-0/+4
| | |
* | | fix force_s3tc_enable optionMrc Gran2007-10-101-1/+1
| | |
* | | [965] Add batchbuffer dumping under INTEL_DEBUG=bat, like 915.Eric Anholt2007-09-271-0/+2
| | |
* | | Revert "WIP 965 conversion to dri_bufmgr."Eric Anholt2007-09-271-6/+19
| | | | | | | | | | | | | | | | | | | | | This reverts commit b2f1aa2389473ed09170713301b042661d70a48e. Somehow I ended up with my branch's save-this-while-I-work-on-master commit actually on master.
* | | WIP 965 conversion to dri_bufmgr.Eric Anholt2007-09-271-19/+6
| | |
* | | [965] Remove AUB file support.Eric Anholt2007-09-271-7/+0
| | | | | | | | | | | | | | | This code existed to dump logs of hardware access to be replayed in simulation. Since we have real hardware now, it's not really needed.
* | | fix a bug in 965 ARB_occlusion_query,Zou Nan hai2007-09-261-2/+2
| | | | | | | | | | | | fd.o bug #12132
* | | Merge branch 'master' into i915-unificationEric Anholt2007-09-201-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_drmpool.c src/mesa/drivers/dri/i915tex/i915_vtbl.c src/mesa/drivers/dri/i915tex/intel_batchbuffer.c src/mesa/drivers/dri/i915tex/intel_context.c
| * | | i965: store read drawable info in intel_context. Some OpenGLXiang, Haihao2007-08-291-0/+4
| | | | | | | | | | | | | | | | operations are based on read drawable. fix bug#10136.
| * | | EXT_texture_sRGB support on i965Zou Nan hai2007-08-021-0/+1
| | | |
| * | | ARB sprite point support on i965Zou Nan hai2007-07-301-0/+5
| | |/ | |/|
* | | Merge branch 'origin' into i915-unificationEric Anholt2007-06-211-5/+8
|\| |
| * | i965: Add pci info for 965GME/GLE chip.Wang Zhenyu2007-05-311-5/+8
| |/
* / Convert i915tex to the new interface and make it compile.Eric Anholt2007-05-171-4/+2
|/
* Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-02-251-14/+20
|\
| * Merge branch 'vbo-0.2'Keith Whitwell2007-02-021-4/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/texcompress_s3tc.c src/mesa/tnl/t_array_api.c
| | * Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵Keith Whitwell2007-01-161-4/+47
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vbo-0.2 Conflicts: src/mesa/array_cache/sources src/mesa/drivers/dri/i965/brw_context.c src/mesa/drivers/dri/i965/brw_draw.c src/mesa/drivers/dri/i965/brw_fallback.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/i965/brw_vs_tnl.c src/mesa/drivers/dri/mach64/mach64_context.c src/mesa/main/extensions.c src/mesa/main/getstring.c src/mesa/tnl/sources src/mesa/tnl/t_save_api.c src/mesa/tnl/t_save_playback.c src/mesa/tnl/t_vtx_api.c src/mesa/tnl/t_vtx_exec.c src/mesa/vbo/vbo_attrib.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_api.c src/mesa/vbo/vbo_save_draw.c
| | * | switch several dri drivers overKeith Whitwell2006-10-301-4/+4
| | | |
| * | | Bug #9604: Fix a static buffer allocation failure.Eric Anholt2007-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pool that the static buffer got allocated from was sized by pitch * height, but the buffer generated from it had its size aligned to a tile boundary, so allocation failed if pitch * height wasn't aligned. However, the 2d driver ensures that the size ends at a tile boundary, so just pass the 2d driver's buffer size rather than calculating it.
| * | | Remove dead code causing a warning.Eric Anholt2007-01-261-5/+0
| | | |