00f22f972f
glx: missing static on local function
2008-11-26 10:02:10 -07:00
f0d015cccb
glx: use __glXGetString
2008-11-26 10:00:58 -07:00
9c98e35ff6
glx: use __glXQueryServerString
2008-11-26 10:00:58 -07:00
24b8a8cfe8
glx: implement __glXGetString, hide __glXGetStringFromServer
2008-11-26 10:00:58 -07:00
fd52001c5c
glx: implement QueryVersion using XCB
2008-11-26 10:00:58 -07:00
5444424562
glx: implement __glXQueryServerString using XCB
2008-11-26 10:00:58 -07:00
df6155fcff
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-11-24 14:08:58 -07:00
d52e8543b6
glx: Add missing include for XCB, fixing crash on 64-bit.
...
Bug #18689
2008-11-24 11:40:38 -08:00
7468765b18
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/prog_print.c
2008-11-15 16:53:24 +00:00
e1fbb30211
glFlush before CopySubBuffer, fix coordinates and extension name typo.
2008-11-12 15:26:25 -05:00
becf3d9272
glx: fix xcb build
2008-11-12 06:56:42 -07:00
19e4222f93
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-11 14:42:41 -07:00
57d78067bd
Don't mess with emacs tab width.
2008-11-11 13:41:43 -05:00
13f96c5401
GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident()
...
See bug 18445.
When getting array results, __glXReadReply() always reads a multiple of
four bytes. This can cause writing to invalid memory when 'n' is not a
multiple of four.
Special-case the glAreTexturesResident() functions now.
To fix the bug, we use a temporary buffer that's a multiple of four bytes
in length.
NOTE: this commit also reverts part of commit 919ec22ecf
2008-11-10 14:27:42 -07:00
61d3a66456
Merge commit 'origin/master' into gallium-0.2
2008-10-27 15:37:22 +00:00
0970de3171
glx: updated comment
2008-10-21 08:20:43 -06:00
d533a5d00a
Update DRI2 implementation according to new specification.
2008-10-15 11:18:05 +01:00
e5ef0beb05
Revert pointless reindents to avoid merge conflicts.
...
Why are we reindenting code that's work in progress...
2008-10-15 11:18:05 +01:00
5f6472fc69
glx: indent -br -i3 -npcs --no-tabs glxclient.h
2008-10-15 11:18:05 +01:00
5e3edb6f98
glx: indent -br -i3 -npcs --no-tabs glcontextmodes.h
2008-10-15 11:18:04 +01:00
00be6dfe2b
glx: indent -br -i3 -npcs --no-tabs glxextensions.c
2008-10-15 11:18:04 +01:00
c6d037678d
glx: indent -br -i3 -npcs --no-tabs glxextensions.h
2008-10-15 11:18:00 +01:00
1bb4658fab
glx: indent -br -i3 -npcs --no-tabs xfont.c
2008-10-15 11:17:59 +01:00
b57e9f2a74
glx: indent -br -i3 -npcs --no-tabs xf86dristr.h
2008-10-15 11:17:59 +01:00
400c2d0cea
glx: indent -br -i3 -npcs --no-tabs XF86dri.c
2008-10-15 11:17:58 +01:00
b69ef3eb51
glx: indent -br -i3 -npcs --no-tabs xf86dri.h
2008-10-15 11:17:58 +01:00
f7ff9f1913
glx: kill old K&R syntax in XF86dri.c
2008-10-15 11:17:58 +01:00
dd8b90a81b
glx: indent -br -i3 -npcs --no-tabs vertarr.c
2008-10-15 11:17:58 +01:00
801933c3e4
glx: indent -br -i3 -npcs --no-tabs singlepix.c
2008-10-15 11:17:57 +01:00
ee88fff432
glx: indent -br -i3 -npcs --no-tabs single2.c
2008-10-15 11:17:57 +01:00
750f497713
glx: indent -br -i3 -npcs --no-tabs renderpix.c
2008-10-15 11:17:57 +01:00
5b48c862c6
glx: indent -br -i3 -npcs --no-tabs render2.c
2008-10-15 11:17:56 +01:00
3c900bd546
glx: indent -br -i3 -npcs --no-tabs pixelstore.c
2008-10-15 11:17:56 +01:00
32d7d5fbae
glx: indent -br -i3 -npcs --no-tabs pixel.c
2008-10-15 11:17:56 +01:00
1b2f122739
glx: indent -br -i3 -npcs --no-tabs packsingle.h
2008-10-15 11:17:55 +01:00
3a2568b375
glx: indent -br -i3 -npcs --no-tabs packrender.h
2008-10-15 11:17:55 +01:00
b5f7c84cdf
glx: indent -br -i3 -npcs --no-tabs indirect_window_pos.c
2008-10-15 11:17:55 +01:00
f9fa7400d7
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_program.c
2008-10-15 11:17:55 +01:00
76ddfa3a4c
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array_priv.h
2008-10-15 11:17:54 +01:00
c09881c79f
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.h
2008-10-15 11:17:54 +01:00
f2d45617dd
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.c
2008-10-15 11:17:54 +01:00
5ae395a883
glx: indent -br -i3 -npcs --no-tabs indirect_transpose_matrix.c
2008-10-15 11:17:53 +01:00
4cc369e820
glx: indent -br -i3 -npcs --no-tabs indirect_texture_compression.c
2008-10-15 11:17:53 +01:00
5a3db8004e
glx: indent -br -i3 -npcs --no-tabs glx_query.c
2008-10-15 11:17:51 +01:00
35dc7eadfa
glx: indent -br -i3 -npcs --no-tabs glx_pbuffer.c
2008-10-15 11:17:51 +01:00
3dd46f15c3
glx: indent -br -i3 -npcs --no-tabs glxhash.c
2008-10-15 11:17:51 +01:00
b87e8ae0f5
glx: indent -br -i3 -npcs --no-tabs glxhash.h
2008-10-15 11:17:50 +01:00
b7f76587b8
glx: indent -br -i3 -npcs --no-tabs glxext.c
2008-10-15 11:17:49 +01:00
3959d457d6
glx: indent -br -i3 -npcs --no-tabs glxcurrent.c
2008-10-15 11:17:49 +01:00
c6ea997137
glx: indent -br -i3 -npcs --no-tabs glxcmds.c
2008-10-15 11:17:48 +01:00
b928a12ee3
glx: indent -br -i3 -npcs --no-tabs glcontextmodes.c
2008-10-15 11:17:48 +01:00
7f04f8ddee
glx: indent -br -i3 -npcs --no-tabs eval.c
2008-10-15 11:17:48 +01:00
a1a2078f71
glx: indent -br -i3 -npcs --no-tabs drisw_glx.c
2008-10-15 11:17:48 +01:00
79d830ce5d
glx: indent -br -i3 -npcs --no-tabs dri_glx.c
2008-10-15 11:17:47 +01:00
e7970d6b17
glx: indent -br -i3 -npcs --no-tabs dri_common.h
2008-10-15 11:17:47 +01:00
321a73d9d5
glx: indent -br -i3 -npcs --no-tabs dri_common.c
2008-10-15 11:17:47 +01:00
9ca7330be3
glx: indent -br -i3 -npcs --no-tabs dri2.h
2008-10-15 11:17:47 +01:00
ae5b588dc9
glx: indent -br -i3 -npcs --no-tabs dri2_glx.c
2008-10-15 11:17:47 +01:00
0965740c49
glx: indent -br -i3 -npcs --no-tabs dri2.c
2008-10-15 11:17:46 +01:00
7d16aaadf1
glx: indent -br -i3 -npcs --no-tabs compsize.c
2008-10-15 11:17:46 +01:00
109f3f709f
glx: indent -br -i3 -npcs --no-tabs clientattrib.c
2008-10-15 11:17:46 +01:00
696bf66fa9
glx: add a line of Emacs helping variables
2008-10-15 11:17:46 +01:00
4f31200a33
glx: No need to zero a local variable.
...
My previous commit e206034863
2008-10-15 11:17:45 +01:00
b4bb29cecd
glx: make INIT_MESA_SPARC more robust
...
Embed the macro body into do { ... } while(0) .
2008-10-15 11:17:45 +01:00
4830809524
Update DRI2 implementation according to new specification.
2008-10-14 23:07:55 -04:00
77c7f90ed4
Revert pointless reindents to avoid merge conflicts.
...
Why are we reindenting code that's work in progress...
2008-10-14 23:07:42 -04:00
351de8aecc
glx: indent -br -i3 -npcs --no-tabs glxclient.h
2008-10-13 16:53:41 -06:00
03b471d389
glx: indent -br -i3 -npcs --no-tabs glcontextmodes.h
2008-10-13 16:53:41 -06:00
843a09cf5c
glx: indent -br -i3 -npcs --no-tabs glxextensions.c
2008-10-13 16:53:41 -06:00
80c83c97fc
glx: indent -br -i3 -npcs --no-tabs glxextensions.h
2008-10-13 16:53:41 -06:00
1d0a9e4377
glx: indent -br -i3 -npcs --no-tabs xfont.c
2008-10-13 16:53:41 -06:00
4a3ccc6ca5
glx: indent -br -i3 -npcs --no-tabs xf86dristr.h
2008-10-13 16:53:41 -06:00
4d2a381114
glx: indent -br -i3 -npcs --no-tabs XF86dri.c
2008-10-13 16:53:41 -06:00
04a810beac
glx: indent -br -i3 -npcs --no-tabs xf86dri.h
2008-10-13 16:53:41 -06:00
4c4cb1b5d1
glx: kill old K&R syntax in XF86dri.c
2008-10-13 16:53:40 -06:00
b9a2d35429
glx: indent -br -i3 -npcs --no-tabs vertarr.c
2008-10-13 16:53:40 -06:00
64085b2c2c
glx: indent -br -i3 -npcs --no-tabs singlepix.c
2008-10-13 16:53:40 -06:00
dd0edeb887
glx: indent -br -i3 -npcs --no-tabs single2.c
2008-10-13 16:53:40 -06:00
507808875d
glx: indent -br -i3 -npcs --no-tabs renderpix.c
2008-10-13 16:53:40 -06:00
6bfd57ecde
glx: indent -br -i3 -npcs --no-tabs render2.c
2008-10-13 16:53:40 -06:00
40c481dc91
glx: indent -br -i3 -npcs --no-tabs pixelstore.c
2008-10-13 16:53:40 -06:00
6581071c1d
glx: indent -br -i3 -npcs --no-tabs pixel.c
2008-10-13 16:53:40 -06:00
cfe7f20d0e
glx: indent -br -i3 -npcs --no-tabs packsingle.h
2008-10-13 16:53:40 -06:00
0cff716e70
glx: indent -br -i3 -npcs --no-tabs packrender.h
2008-10-13 16:53:40 -06:00
68583292b1
glx: indent -br -i3 -npcs --no-tabs indirect_window_pos.c
2008-10-13 16:53:40 -06:00
ccc03b427a
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_program.c
2008-10-13 16:53:40 -06:00
1c916736b8
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array_priv.h
2008-10-13 16:53:40 -06:00
9389aa3c0b
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.h
2008-10-13 16:53:40 -06:00
c868ab3dd1
glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.c
2008-10-13 16:53:40 -06:00
39df336635
glx: indent -br -i3 -npcs --no-tabs indirect_transpose_matrix.c
2008-10-13 16:53:39 -06:00
64d1c10e6c
glx: indent -br -i3 -npcs --no-tabs indirect_texture_compression.c
2008-10-13 16:53:39 -06:00
6020e6e66a
glx: indent -br -i3 -npcs --no-tabs glx_query.c
2008-10-13 16:53:39 -06:00
2d4c26b85e
glx: indent -br -i3 -npcs --no-tabs glx_pbuffer.c
2008-10-13 16:53:39 -06:00
bd6a3d5975
glx: indent -br -i3 -npcs --no-tabs glxhash.c
2008-10-13 16:53:39 -06:00
39c958944c
glx: indent -br -i3 -npcs --no-tabs glxhash.h
2008-10-13 16:53:39 -06:00
acb7e52430
glx: indent -br -i3 -npcs --no-tabs glxext.c
2008-10-13 16:53:39 -06:00
3a2d2fcd8a
glx: indent -br -i3 -npcs --no-tabs glxcurrent.c
2008-10-13 16:53:39 -06:00
1293356c60
glx: indent -br -i3 -npcs --no-tabs glxcmds.c
2008-10-13 16:53:39 -06:00
07c9bd246d
glx: indent -br -i3 -npcs --no-tabs glcontextmodes.c
2008-10-13 16:53:39 -06:00
f76724b767
glx: indent -br -i3 -npcs --no-tabs eval.c
2008-10-13 16:53:39 -06:00
60aa0918a1
glx: indent -br -i3 -npcs --no-tabs drisw_glx.c
2008-10-13 16:53:39 -06:00
4e88ae5639
glx: indent -br -i3 -npcs --no-tabs dri_glx.c
2008-10-13 16:53:39 -06:00
09c889b318
glx: indent -br -i3 -npcs --no-tabs dri_common.h
2008-10-13 16:53:39 -06:00
4d86228321
glx: indent -br -i3 -npcs --no-tabs dri_common.c
2008-10-13 16:53:38 -06:00
2e8d62be61
glx: indent -br -i3 -npcs --no-tabs dri2.h
2008-10-13 16:53:38 -06:00
bca6e79a45
glx: indent -br -i3 -npcs --no-tabs dri2_glx.c
2008-10-13 16:53:38 -06:00
66cc150770
glx: indent -br -i3 -npcs --no-tabs dri2.c
2008-10-13 16:53:38 -06:00
f788a8ed69
glx: indent -br -i3 -npcs --no-tabs compsize.c
2008-10-13 16:53:38 -06:00
ee3a6cec36
glx: indent -br -i3 -npcs --no-tabs clientattrib.c
2008-10-13 16:53:38 -06:00
58b72103d3
glx: add a line of Emacs helping variables
2008-10-13 16:53:38 -06:00
61eb4f50eb
glx: No need to zero a local variable.
...
My previous commit e206034863
2008-10-13 16:53:38 -06:00
0b188d1cdc
glx: make INIT_MESA_SPARC more robust
...
Embed the macro body into do { ... } while(0) .
2008-10-13 16:53:38 -06:00
c9122c0c03
mesa: Remove left over merge conflicts
2008-09-22 12:47:57 +02:00
45efcc44c7
Remove CVS keywords.
...
Cherry-picked from gallium-0.1
Conflicts:
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
2008-09-21 11:00:44 -07:00
9644fa6c48
Merge branch 'master' into gallium-0.2
...
Conflicts:
include/GLES/egl.h
include/GLES/egltypes.h
src/egl/main/eglconfig.c
src/egl/main/eglconfig.h
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/Makefile
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
src/mesa/drivers/x11/xm_buffer.c
src/mesa/glapi/glapi.c
src/mesa/main/dispatch.c
src/mesa/main/state.c
src/mesa/main/texstate.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/arbprogram.c
src/mesa/shader/nvfragparse.c
src/mesa/shader/nvprogram.c
src/mesa/shader/shader_api.c
src/mesa/sources
src/mesa/swrast/s_aaline.c
src/mesa/swrast/s_aaline.h
src/mesa/swrast/s_aatriangle.h
src/mesa/swrast/s_accum.c
src/mesa/swrast/s_alpha.h
src/mesa/swrast/s_bitmap.c
src/mesa/swrast/s_blend.h
src/mesa/swrast/s_context.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_depth.c
src/mesa/swrast/s_depth.h
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_drawpix.h
src/mesa/swrast/s_feedback.c
src/mesa/swrast/s_feedback.h
src/mesa/swrast/s_fog.h
src/mesa/swrast/s_lines.h
src/mesa/swrast/s_logic.h
src/mesa/swrast/s_masking.h
src/mesa/swrast/s_points.c
src/mesa/swrast/s_points.h
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_span.h
src/mesa/swrast/s_stencil.h
src/mesa/swrast/s_texcombine.c
src/mesa/swrast/s_texcombine.h
src/mesa/swrast/s_texfilter.c
src/mesa/swrast/s_texfilter.h
src/mesa/swrast/s_texstore.c
src/mesa/swrast/s_triangle.c
src/mesa/swrast/s_triangle.h
src/mesa/swrast/s_zoom.h
src/mesa/swrast_setup/ss_context.c
src/mesa/swrast_setup/ss_triangle.h
src/mesa/tnl/t_draw.c
src/mesa/tnl/t_vb_light.c
src/mesa/tnl/t_vertex_generic.c
src/mesa/tnl/t_vertex_sse.c
src/mesa/tnl/t_vp_build.h
src/mesa/tnl/tnl.h
src/mesa/x86/common_x86.c
2008-09-21 10:28:06 -07:00
dc8058c337
Update to SGI FreeB 2.0.
...
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
2008-09-19 17:16:53 -04:00
19d9c81b8c
glx: re-add glapi/ path
2008-09-18 21:22:08 -06:00
4eb95ce807
glx: added "glapi/" prefix to include
2008-09-18 20:27:16 -06:00
8d41e4536d
mesa: fix asst path/include mistakes in prev commits
2008-09-18 16:48:11 -06:00
a25e1aa0aa
glx: remove #include "glheader.h" lines
...
Was only used to get the PUBLIC/USED macros.
Also, replace "GL_FALSE" with "False" in a couple places.
2008-09-18 13:26:30 -06:00
3537da87de
glx: remove depency on glheader.h and GLboolean type in XF86DRI code
...
Return Bool instead of GLboolean to match other functions.
Define PUBLIC/USED macros locally.
2008-09-18 13:23:06 -06:00
89ab66448e
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
2008-09-18 19:03:02 +01:00
841205e365
dri/swrast: fix swapBuffers after dri2
2008-09-18 18:52:14 +01:00
811d8b86eb
glx: fix 64-bit datatype issue
2008-09-13 14:24:31 -06:00
bdc8ac4ae2
Finish off the previous fix for TFP.
...
A couple of those lines of debug printfs I deleted weren't actually debug
printfs.
2008-09-12 15:09:43 -07:00
d3dc95e26a
dri/swrast: fix swapBuffers after dri2
2008-09-12 12:43:10 +03:00
47ad296a18
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
...
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 17:32:18 +01:00
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
A first attempt at moving gallium onto a branch directly off master...
It will be interesting to see how much work this takes to get running.
Have resolved the conflicts semi-arbitarily, not compiled or tested.
Conflicts:
.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj
2008-09-11 16:05:15 +01:00
f56b569e9a
DRI2: Drop sarea, implement swap buffers in the X server.
2008-08-29 12:13:14 -04:00
8434c65bb9
glx: free driScreen in FreeScreenConfigs()
2008-08-20 15:33:03 -06:00
8b51278134
glx: free context in driDestroyContext()
2008-08-20 15:33:03 -06:00
e206034863
glx: free vertex array state when context is destroyed
2008-08-20 15:33:03 -06:00
fb36a54a1c
fix mem leak (free psc->visuals)
2008-08-20 15:33:03 -06:00
d8be393cb6
fix compilation
2008-08-13 07:14:47 -04:00
98e7c1cf38
Fixed 'make install' for darwin
2008-08-12 10:59:40 -07:00
ac0d19601c
Apple: Cleaned up some linking and dylib ids issues
2008-08-11 09:17:06 -07:00
919ec22ecf
glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection
2008-08-08 02:52:10 -07:00
ec770150ed
glx/x11: Fix missing __GL_EXT_BYTES declaration
2008-08-08 02:37:14 -07:00
62fb5f7b9a
Drop unused 'entries' field from __glxHashTable.
2008-08-04 15:44:34 -04:00
27e3f7f21d
glx: Update my e-mail address. :)
2008-07-15 11:06:31 -07:00
67108adb48
glx: Trivial clean-ups to __glXSetArrayEnable
2008-07-15 11:06:04 -07:00
4fab47b13c
glx/dri: only report DRI2 extensions when DRI2 is enabled.
...
Fixes bug 15477
2008-07-13 19:00:46 +10:00
db072baaaf
Call mklib with $(SHELL) so the user controls the interpreter
...
Respect the user's choice of shell when running mklib rather than always
using /bin/sh.
2008-07-12 10:25:40 -07:00
df2c9424d3
glx: added __glXPreferEGL() to tell libGL to prefer "egl_" drivers over regular DRI drivers.
...
Also, clean-up, consolidate the dlopen() code a bit.
2008-07-11 15:45:03 -06:00
a36bf890e8
glx: add LIBGL_ALWAYS_SOFTWARE
...
this disables accelerated DRI and fallbacks to client-side software rendering.
compile-tested only.
2008-07-07 18:34:17 +03:00
9157b1e09a
glcontextmodes.c is required remove the reference in .gitignore
2008-07-04 13:54:49 +01:00
4ba39c40ae
Fix builds with compilers other than gcc 3.0 & newer
...
Add #include "glheader.h" for definition of __builtin_expect for compilers
that don't support it.
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
2008-06-21 10:19:45 -06:00
1087cc61b3
glx: load swrast_dri.so
...
caveats:
- does not work with old (i.e. libGLcore) xserver:
- made unbindContext a noop
- extensions:
GLX_SGI_make_current_read
GLX_EXT_texture_from_pixmap
GLX_MESA_copy_sub_buffer
2008-06-13 15:54:08 +03:00
4297413656
glx: use ErrorMessageF
2008-06-13 15:48:06 +03:00
6f7ed99b30
revert the DRI2 commits
2008-06-12 00:11:54 +01:00
RALOVICH, Kristóf
Brian Paul
Bernd Buschinski
Keith Whitwell
Kristian Høgsberg
Hanno Böck
Alan Hourihane
Kristof Ralovich
Jakob Bornecrantz
Adam Jackson
Chris Rankin
George Sapountzis
Guillaume Melquiond
Eric Anholt
Zack Rusin
Jeremy Huddleston
Ian Romanick
Dave Airlie
Dan Nicholson
Alan Coopersmith