aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965
Commit message (Collapse)AuthorAgeFilesLines
* add some #includes to silence warningsBrian2007-05-032-1/+2
|
* Merge branch 'crestline-qa', adding support for the 965GM chipset.Eric Anholt2007-03-302-0/+4
|\
| * Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-261-1/+1
| |\
| * \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-223-5/+5
| |\ \
| * \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-211-9/+3
| |\ \ \
| * \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-191-4/+11
| |\ \ \ \
| * \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-141-15/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-121-1/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-071-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-061-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-061-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-02-2536-4860/+250
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Intel 965GM chipset infoWang Zhenyu2007-02-022-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Revert origin crestline pci id patchWang Zhenyu2007-02-022-4/+0
| | | | | | | | | | | |
| * | | | | | | | | | | 1. Fix bug #155Zou Nan hai2007-01-183-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. I notice multiple ARB_occlusion_query should be able to overlap according to spec. 3. Declaring extern variables in a .c file is evil, fix it.
| * | | | | | | | | | | Merge branch 'master' into crestlineKeith Packard2007-01-066-10/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into crestlineWang Zhenyu2007-01-063-53/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_tex_layout.c Michel Dänzer replaced the copy of the 945 mipmap layout code with that from the 945 driver directly.
| * | | | | | | | | | | | | Support linear format in i965.Haihao Xiang2006-12-263-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #117 #118
| * | | | | | | | | | | | | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2006-12-134-25/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix bug #93, i965 driver not thread safe.Zou Nan hai2006-12-133-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am not confident of it is 100% thread safe now. bufmgr_fake.c need a total rewrite later (cherry picked from 606632ca27558ee1335be2f4a5906f2baa240a6a commit)
| * | | | | | | | | | | | | | fix bug #99.Zou Nan hai2006-12-131-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim_count overflow when there is more than 1 cliprect (cherry picked from 84b958d66fe7d3fe03ed12b493e3f3197f656531 commit)
| * | | | | | | | | | | | | | ARB_occlusion_query supportZou Nan hai2006-12-134-1/+55
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | if (tex width < 4), mipmap calculation will be out of rangeZou Nan hai2006-12-131-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Avoid branch instructions while in single program flow mode.Eric Anholt2006-12-105-59/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is an errata for Broadwater that threads don't have the instruction/loop mask stacks initialized on thread spawn. In single program flow mode, those stacks are not writable, so we can't initialize them. However, they do get read during ELSE and ENDIF instructions. So, instead, replace branch instructions in single program flow mode with predicated jumps (ADD to the ip register), avoiding use of the more complicated branch instructions that may fail. This is also a minor optimization as no ENDIF equivalent is necessary.
| * | | | | | | | | | | | | | Connect INTEL_DEBUG=sync up to cmd/batch ioctls.Eric Anholt2006-12-101-2/+30
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | adding pci id of CrestlineWang Zhenyu2006-12-102-0/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix compile errorZou Nan hai2007-03-271-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | merge of glsl-compiler-1 branchBrian2007-03-2617-107/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | merge from masterBrian2007-03-212-19/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'origin' into glsl-compiler-1Brian2007-03-092-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/context.c
| * | | | | | | | | | | | | | | Update DRI drivers for new glsl compiler.Brian2007-02-2317-106/+80
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly: - update #includes - update STATE_* token code
* | | | | | | | | | | | | | | i965: The given urb layout(maximal size of urb entries and theXiang, Haihao2007-03-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values for nr of entries) should meet the requirement.
* | | | | | | | | | | | | | fix for bug#10339Xiang, Haihao2007-03-222-3/+3
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StateFlags has been updated in _mesa_add_state_reference
* | | | | | | | | | | | | fix copy and paste bug from last commit in fog generation code for GL_LINEAR fogRoland Scheidegger2007-03-211-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | fix for bug#10347Xiang, Haihao2007-03-201-9/+3
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not sure which brw surface for DXT3 & DXT5, so restore the previous choice.(changed in commit 84081774e62a8af18e6bf894ea69f63b97dcfe96)
* | | | | | | | | | | i965: fix for FXT1 & S3TC texture formatXiang, Haihao2007-03-181-4/+11
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | choose the right mesa texformat for FXT1 & S3TC
* | | | | | | | | | sync up t_vp_build.c brw_vs_tnl.c a bitRoland Scheidegger2007-03-131-15/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring over the optimizations for fog and normalized spot dir from t_vp_build.c to brw_vs_tnl.c. Likewise, port a fix for point size calc from brw_vs_tnl.c to t_vp_build.c (use ABS(eyez) instead of -eyez). Leave the now differing point size calcs alone though, not sure what's better (it's basically MOV, ABS, MUL, DP3 vs. ABS, MAD, MAD).
* | | | | | | | | fix for bug#10196Xiang, Haihao2007-03-111-1/+8
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute half if LOCAL_VIEWER is enabled and the light is a directional source.
* | | | | | | | Fix/improve framebuffer object reference counting.Brian2007-03-061-2/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use _mesa_reference_framebuffer() and _mesa_unreference_framebuffer() functions to be sure reference counting is done correctly. Additional assertions are done too. Note _mesa_dereference_framebuffer() renamed to "unreference" as that's more accurate.
* | | | | | | fix for bug#10182Xiang, Haihao2007-03-061-1/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | call _mesa_dereference_framebuffer instead of _mesa_dereference_framebuffer in i810, i915, i915tex, i965 drivers.
* | | | | | fix for bug#9971Xiang, Haihao2007-03-051-0/+1
|/ / / / / | | | | | | | | | | | | | | | call swsetup_Wakeup before falling back to software rendering
* | | | | I965: fix a failure on waiting irq.Xiang, Haihao2007-02-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Wait until getting the right fence if drm/i915 resets the counter.
* | | | | Merge branch 'vbo-0.2'Keith Whitwell2007-02-0229-4845/+213
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/texcompress_s3tc.c src/mesa/tnl/t_array_api.c
| * | | | | Modify assert to reflect rebase criteriaKeith Whitwell2007-02-021-1/+9
| | | | | |
| * | | | | Correct usage/meaning of max_index parameter.Keith Whitwell2007-02-012-2/+4
| | | | | |
| * | | | | Cope with internally-generated null inputs.Keith Whitwell2007-02-011-3/+6
| | | | | |
| * | | | | Use new rebase helper. Remove other rebase code.Keith Whitwell2007-01-302-90/+68
| | | | | |
| * | | | | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵Keith Whitwell2007-01-1633-174/+596
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | merge current trunk into vbo branchAlan Hourihane2006-11-023-44/+25
| | | | | |
| * | | | | cleanup code, compiles with vbo changesKeith Whitwell2006-10-3115-612/+98
| | | | | |