aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915/i915_context.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'const-buffer-changes'Brian Paul2009-05-011-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_curbe.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/i965/brw_wm_glsl.c
| * i915: check the new _NEW_PROGRAM_CONSTANT flagBrian Paul2009-04-221-1/+1
| |
* | intel: fix max anisotropy supportedRoland Scheidegger2009-04-221-0/+2
|/ | | | | | i915 actually supports up to 4 (according to header file - not tested), i965 up to 16 (code already handled this but slightly broken), so don't use 2 for all chips, even though angular dependency is very high.
* i915: Remove dead i830TexEnv and i915TexEnv.Eric Anholt2009-04-161-1/+0
| | | | | These LOD bias updates are covered by the texture state uploads in *_texstate.c now.
* intel: Clean up several 965 memory leaks on context destroy.Eric Anholt2009-02-171-0/+2
|
* intel: Fix up some extension string issuesIan Romanick2009-01-281-13/+0
| | | | | Move the remaining extension string enables to intel_extensions.c. Make sure that GL_NV_texture_env_combine4 is not enabled on i830.
* Make GL_ARB_draw_buffers mandatoryIan Romanick2009-01-281-0/+2
| | | | Signed-off-by: Ian Romanick <[email protected]>
* mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt2009-01-071-1/+0
| | | | | | | | There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <[email protected]>
* intel: disable ATI_texture_env_combine3 for i830( and related device).Xiang, Haihao2008-12-301-0/+1
| | | | Thanks to Eric for pointing it out.
* Unify ARB_depth_texture and SGIX_depth_textureIan Romanick2008-10-011-2/+0
| | | | | | | The ARB extension is a superset of the older SGIX extension. Any hardware that can support the SGIX version can also support the ARB version. In Mesa, any driver that supports one also supports the other. This unification just simplifies some bits of code.
* mesa: added "main/" prefix to includes, remove some -I paths from ↵Brian Paul2008-09-181-1/+1
| | | | Makefile.template
* Revert "Revert "Merge branch 'drm-gem'""Dave Airlie2008-08-241-0/+3
| | | | This reverts commit 7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a.
* Revert "Merge branch 'drm-gem'"Dave Airlie2008-08-241-3/+0
| | | | | | | | This reverts commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03. Conflicts: src/mesa/drivers/dri/i965/brw_wm_surface_state.c
* Merge branch 'master' into drm-gemIan Romanick2008-07-251-1/+0
|\ | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/i965/brw_wm_surface_state.c
| * intel: Clean-up ARB_texture_env_crossbarIan Romanick2008-07-161-1/+0
| | | | | | | | | | Enable support for ARB_texture_env_crossbar in the master extension list instead of in every single device-specific list.
* | Merge commit 'origin/master' into drm-gemEric Anholt2008-06-241-1/+0
|\|
| * intel: Same pixel function init for everyone now.Eric Anholt2008-06-241-1/+0
| |
* | i915: Restore the accelerated PBO pixel path functions after GEM changes.Eric Anholt2008-06-181-1/+1
| | | | | | | | | | The fencing code is not required, and waiting on the fences defeated one of the purposes of the extension, which is to allow asynchronous readpixels.
* | [intel] Fix no_rast option on non-965.Eric Anholt2008-06-171-0/+3
| | | | | | | | | | The no_rast fallback was getting partially overwritten by later TNL init, resulting in a segfault when things were in a mixed-up state.
* | Temporarily disable intel pixel ops on i915 for GEMKeith Packard2008-05-051-1/+1
|/ | | | | Instead of attempting to fix these for GEM, just disable until GEM is working.
* intel: Add missing include file to silence last couple of warnings.Kristian Høgsberg2008-02-251-0/+1
|
* intel: Merge intel_context.c from i915 and i965.Kristian Høgsberg2008-02-221-0/+12
|
* Move i915tex driver into place as just i915.Eric Anholt2007-09-241-0/+174
|
* Remove the old i915 driver now that i915tex works without TTM.Eric Anholt2007-09-241-186/+0
|
* Restore the UseTexEnvProgram logic.Brian2007-03-271-0/+1
| | | | | Was removed during glsl-compiler work. Still need to go back and revisit this because of the interaction with fragment shaders...
* Update DRI drivers for new glsl compiler.Brian2007-02-231-1/+1
| | | | | | Mostly: - update #includes - update STATE_* token code
* Merge branch 'origin' into glsl-compiler-1Brian2007-02-221-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c
| * switch several dri drivers overKeith Whitwell2006-10-301-2/+3
| |
* | vertex/fragment program field changesBrian2006-12-151-2/+1
|/
* Init _UseTexEnvProgram to fix failed assertion in i915_render_start() - this ↵Brian Paul2006-10-161-0/+1
| | | | may be temporary
* Use the mesa-provided texenv program rather than rolling our own.Keith Whitwell2006-10-101-0/+2
| | | | Turn on texture crossbar support.
* fix the presumably broken check for the allow_large_textures and vblank_mode ↵Roland Scheidegger2006-09-011-1/+1
| | | | options (same as bug 8042).
* Fix some warnings on x86_64Alan Hourihane2006-04-071-1/+1
|
* replace the texture level hack used in radeon/r200 to allow larger textures ↵Roland Scheidegger2006-02-031-3/+5
| | | | 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.
* Re-org and clean-up of vertx/fragment program limits (instructions,Brian Paul2005-11-011-9/+8
| | | | | | | temporaries, parameters, etc). glGetProgramivARB() now returns all the right things. Updated i915 and r300 code to initialize program native limits and current program's native instruction/temporary/etc counts.
* remove the redundant textureSize field, use tex.size instead, it's always ↵Brian Paul2005-09-091-1/+1
| | | | the same value
* Major rip-up of internal function insertion interface. The oldmesa_6_3_1Ian Romanick2005-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | _glapi_add_entrypoint has been replaced by a new routine called _glapi_add_dispatch. This new routine dynamically assignes dispatch offsets to functions added. This allows IHVs to add support for extension functions that do not have assigned dispatch offsets. It also means that a driver has no idea what offset will be assigned to a function. The vast majority of the changes in this commit account for that. An additional table, driDispatchRemapTable, is added. Functions not in the Linux OpenGL ABI (i.e., anything not in GL 1.2 + ARB_multitexture) has a fixed offset in this new table. The entry in this table specifies the offset in of the function in the real dispatch table. The internal interface was also bumped from version 20050725 to 20050727. This has been tested with various programs in progs/demos on: radeon (Radeon Mobility M6) r128 (Rage 128 Pro) mga (G400)
* Replace add_newer_entrypoints (src/mesa/main/context.c) withIan Romanick2005-06-301-7/+8
| | | | | | | | | | | | | | | device-specific code. A new Python script (src/mesa/glapi/extension_helper.py) generates a list of all entry-points for all known extensions. Each driver the selects only the extensions that it needs and enables the via either driInitExtensions or driInitSingleExtension. This code has been compile-tested on a drivers, but has only been run-tested on mga and i915 (on i830 hardware). These changes were discussed at length on the mesa3d-dev mailing list. http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2
* i915 will use _TexEnvProgram (if active)Keith Whitwell2005-05-091-2/+4
|
* Revert some accidental cross-merge changes. Remove i915GetString. MigrateIan Romanick2005-01-071-74/+3
| | | | | a couple extensions that appeared in both device-specific card_extensions strings to the shared one.
* Add Intel i915GM support, and these extensions.Alan Hourihane2005-01-061-4/+27
| | | | | | | | | | | | | | | * GL_ARB_texture_cube_map * GL_EXT_blend_equation_separate * GL_ATI_blend_equation_separate * GL_ARB_point_parameters * GL_NV_blend_square * GL_EXT_cull_vertex * GL_ARB_depth_texture * GL_SGIX_depth_texture * GL_ARB_shadow * GL_EXT_shadow_funcs * GL_3DFX_texture_compression_FXT1 (Keith Whitwell, Tungsten Graphics)
* Add GL_ARB_texture_cube_map support for i830. Most of the code wasIan Romanick2004-09-191-1/+0
| | | | | | lifted from the i915 side. i830 will now report version 1.3! Hurrah! With the exception of GL_EXT_texture_compression_s3tc, the i830 driver now supports all the extensions that its Windows counterpart supports.
* Added GL_ARB_point_parameters support for i830.Ian Romanick2004-09-191-1/+0
|
* Merge in all the i830 functional differences from the old i830 driver.Ian Romanick2004-09-191-4/+1
|
* add missing license textsKeith Whitwell2004-06-181-0/+20
|
* re-enable rect textureAlan Hourihane2004-06-111-1/+1
|
* New driver for i915 as well as older i830/i845/i865 chipsets.Keith Whitwell2004-06-101-0/+211