Michel Dänzer
78f4a695ad
Remove incorrect test from mmAllocMem.
...
0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was
broken by this.
2008-09-22 11:48:26 +02:00
Keith Whitwell
dace236c5f
Merge branch 'master' into gallium-0.2
...
Conflicts:
src/mesa/glapi/glapi.h
src/mesa/main/api_exec.c
src/mesa/main/attrib.c
src/mesa/main/clear.c
src/mesa/main/context.c
src/mesa/main/mfeatures.h
src/mesa/main/mipmap.c
src/mesa/main/mipmap.h
src/mesa/main/readpix.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/texparam.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_context.c
src/mesa/x86/common_x86_asm.S
2008-09-21 22:30:55 -07:00
Brian Paul
6fd15dd806
mesa: allow for extra per-context init
...
(cherry picked from commit 815cdcfbc0
2008-09-21 22:13:57 -07:00
Brian Paul
1b7e909845
mesa: texture crop rect state
...
(cherry picked from commit c01fbc7866
2008-09-21 22:13:57 -07:00
Brian Paul
93c90d34d1
mesa: set point state
...
(cherry picked from commit af3d9dba56
2008-09-21 22:13:57 -07:00
Brian Paul
868c09a267
mesa: fix some feature tests
...
(cherry picked from commit 74b14fe6dd
2008-09-21 22:13:57 -07:00
Brian Paul
8122ab2dfd
mesa: fix some pixel transfer state tests for depth formats
...
(cherry picked from commit 966e199e40
2008-09-21 22:13:57 -07:00
Brian Paul
6bc8749cd5
mesa: fix issues causing warnings on Windows
2008-09-21 22:13:57 -07:00
Michal Krol
9614eac85d
mesa: Silence compiler warnings on Windows.
2008-09-21 22:13:57 -07:00
Brian Paul
ce1685ce94
mesa: comments about vectors vs components
2008-09-21 22:13:57 -07:00
Brian Paul
eb10fa3ed6
mesa: remove debug code
2008-09-21 22:13:57 -07:00
Brian Paul
6246dd890f
mesa: implement glGetUniformiv() with new ctx->Driver function
...
The old implementation could overwrite the caller's param buffer.
2008-09-21 22:13:56 -07:00
Brian Paul
48cba703fa
mesa: added case for fixed pt
2008-09-21 22:13:56 -07:00
Brian Paul
1cf2c8a043
mesa: point size arrays
2008-09-21 22:13:56 -07:00
José Fonseca
f8e50dd796
mesa: Replace deprecated __MSC__ macro.
2008-09-21 22:13:56 -07:00
José Fonseca
60325331a8
mesa: More signed/unsigned float/integer fixes.
2008-09-21 22:13:56 -07:00
José Fonseca
457d7218b8
mesa: Use appropriate unsigned/signed, float/integer types.
2008-09-21 22:13:56 -07:00
José Fonseca
88f729e4ec
mesa: Use _mesa_bsearch.
2008-09-21 22:13:56 -07:00
José Fonseca
baa76e9aa2
mesa: bsearch implementation for WinCE.
2008-09-21 22:13:56 -07:00
José Fonseca
2e8af5ffcf
mesa: ASSERT macro is already defined by WinCE headers.
...
Even when just the standard headers are used....
2008-09-21 22:13:56 -07:00
Brian Paul
c115616bda
mesa: init ctx->RenderMode
2008-09-21 22:13:56 -07:00
Brian Paul
d17485fef9
mesa: GL_BYTE vertex/texcoord arrays
2008-09-21 22:13:55 -07:00
Brian Paul
394c1d1c53
mesa: initial support for fixed-pt vertex arrays
2008-09-21 22:13:55 -07:00
Brian Paul
bb00f09f1b
mesa: refactor: move initialization of DefaultPacking state.
2008-09-21 22:13:55 -07:00
Brian Paul
9b8b58b79a
mesa: fix errors in prev commit
2008-09-21 22:13:55 -07:00
Brian Paul
3a4bed8f08
mesa: revamp glBlendFunc loopback
2008-09-21 22:13:55 -07:00
Brian Paul
85f553d3c1
mesa: fix some FEATURE_x tests
2008-09-21 22:13:55 -07:00
Brian Paul
b51d73dd94
mesa: test for FEATURE_ATI_fragment_shader
2008-09-21 22:13:55 -07:00
Brian Paul
715715e230
mesa: fix ReadBuffer initialization
2008-09-21 22:13:55 -07:00
Brian Paul
cd4d4f590f
mesa: FEATURE_dispatch to control dispatch table usage
2008-09-21 22:13:55 -07:00
Brian Paul
2dbc515a66
mesa: move some glapi bits around
...
Move _glapi_proc typedef from glapitable.h to glapi.h
Also, don't include glapitable.h from glapi.h
Before we were including the huge glapitable.h file in every .c file.
2008-09-21 22:13:55 -07:00
Brian Paul
d22ef6bcba
mesa: remove some temp debug code
2008-09-21 22:13:54 -07:00
Brian Paul
4e3ae76fea
mesa: check FEATURE_ARB_occlusion_query
2008-09-21 22:13:54 -07:00
Brian Paul
049a59a87c
mesa: fix typo: s/stacks/stack/
2008-09-21 22:13:54 -07:00
Brian
74c64fa748
code refactoring, new next_mipmap_level_size() function
...
(cherry picked from commit c22d9152e3
2008-09-21 22:13:54 -07:00
Brian
e93243f8b7
added _mesa_tex_target_to_face()
...
(cherry picked from commit b52ce6341f
2008-09-21 22:13:54 -07:00
Brian
abb465cdc7
refactor code, export _mesa_generate_mipmap_level()
2008-09-21 22:13:54 -07:00
Brian
12dc9c99b9
move _mesa_format_to_type_and_comps() to texformat.c
...
(cherry picked from commit 42eac65da4
2008-09-21 22:13:54 -07:00
Keith Whitwell
b082002379
mesa: pull in mipmap.c changes from gallium-0.2
2008-09-21 22:13:54 -07:00
Brian Paul
facfb44d37
mesa: remove unneeded #include
...
(cherry picked from commit 6363960db5
2008-09-21 22:13:54 -07:00
Brian Paul
ddd630ef90
mesa: refactor: move various ENUM_TO_x macros into macros.h
2008-09-21 22:13:53 -07:00
Brian Paul
ae1fdc1523
mesa: refactor: move glTexParameter-related functions into new texparam.c file
2008-09-21 22:13:53 -07:00
Brian Paul
11ebfd22bb
mesa: refactor: move glTexEnv-related functions into new texenv.c file
...
(cherry picked from commit 7ecac78ab5
2008-09-21 22:13:52 -07:00
Brian Paul
10db6c2d81
mesa: refactor: move glTexGen-related functions into new texgen.c file
...
(cherry picked from commit 27049189d6
2008-09-21 22:13:52 -07:00
Brian Paul
4fc71f3ec2
mesa: refactor: fix some FEATURE_ typos, mistakes
...
(cherry picked from commit e4cfe0854a
2008-09-21 22:13:52 -07:00
Keith Whitwell
34a61c66fd
mesa: refactor: move #define FEATURE flags into new mfeatures.h file
...
Also, check the FEATURE flags in many places.
(cherry picked from commit 40d1a40f29
2008-09-21 22:13:52 -07:00
Brian Paul
24172fe595
mesa: refactor: move _mesa_update_minmax/histogram() into image.c
...
(cherry picked from commit eded7f010d
2008-09-21 22:13:52 -07:00
Brian Paul
c132e2b1db
mesa: refactor: move multisample-related functions into new multisample.c file
2008-09-21 22:13:52 -07:00
Brian Paul
e48defc980
mesa: refactor: move _mesa_resizebuffers(), _mesa_ResizeBuffersMESA() to framebuffer.c
...
(cherry picked from commit 9091015a97
2008-09-21 22:13:51 -07:00
Brian Paul
5ab1d0acea
mesa: refactor: move glClear, glClearColor into new clear.c file.
2008-09-21 22:13:51 -07:00
