Commit graph

415 commits

Author SHA1 Message Date
RALOVICH, Kristóf
1bb4658fab glx: indent -br -i3 -npcs --no-tabs xfont.c 2008-10-15 11:17:59 +01:00
RALOVICH, Kristóf
b57e9f2a74 glx: indent -br -i3 -npcs --no-tabs xf86dristr.h 2008-10-15 11:17:59 +01:00
RALOVICH, Kristóf
400c2d0cea glx: indent -br -i3 -npcs --no-tabs XF86dri.c 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
b69ef3eb51 glx: indent -br -i3 -npcs --no-tabs xf86dri.h 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
f7ff9f1913 glx: kill old K&R syntax in XF86dri.c 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
dd8b90a81b glx: indent -br -i3 -npcs --no-tabs vertarr.c 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
801933c3e4 glx: indent -br -i3 -npcs --no-tabs singlepix.c 2008-10-15 11:17:57 +01:00
RALOVICH, Kristóf
ee88fff432 glx: indent -br -i3 -npcs --no-tabs single2.c 2008-10-15 11:17:57 +01:00
RALOVICH, Kristóf
750f497713 glx: indent -br -i3 -npcs --no-tabs renderpix.c 2008-10-15 11:17:57 +01:00
RALOVICH, Kristóf
5b48c862c6 glx: indent -br -i3 -npcs --no-tabs render2.c 2008-10-15 11:17:56 +01:00
RALOVICH, Kristóf
3c900bd546 glx: indent -br -i3 -npcs --no-tabs pixelstore.c 2008-10-15 11:17:56 +01:00
RALOVICH, Kristóf
32d7d5fbae glx: indent -br -i3 -npcs --no-tabs pixel.c 2008-10-15 11:17:56 +01:00
RALOVICH, Kristóf
1b2f122739 glx: indent -br -i3 -npcs --no-tabs packsingle.h 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
3a2568b375 glx: indent -br -i3 -npcs --no-tabs packrender.h 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
b5f7c84cdf glx: indent -br -i3 -npcs --no-tabs indirect_window_pos.c 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
f9fa7400d7 glx: indent -br -i3 -npcs --no-tabs indirect_vertex_program.c 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
76ddfa3a4c glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array_priv.h 2008-10-15 11:17:54 +01:00
RALOVICH, Kristóf
c09881c79f glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.h 2008-10-15 11:17:54 +01:00
RALOVICH, Kristóf
f2d45617dd glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.c 2008-10-15 11:17:54 +01:00
RALOVICH, Kristóf
5ae395a883 glx: indent -br -i3 -npcs --no-tabs indirect_transpose_matrix.c 2008-10-15 11:17:53 +01:00
RALOVICH, Kristóf
4cc369e820 glx: indent -br -i3 -npcs --no-tabs indirect_texture_compression.c 2008-10-15 11:17:53 +01:00
RALOVICH, Kristóf
5a3db8004e glx: indent -br -i3 -npcs --no-tabs glx_query.c 2008-10-15 11:17:51 +01:00
RALOVICH, Kristóf
35dc7eadfa glx: indent -br -i3 -npcs --no-tabs glx_pbuffer.c 2008-10-15 11:17:51 +01:00
RALOVICH, Kristóf
3dd46f15c3 glx: indent -br -i3 -npcs --no-tabs glxhash.c 2008-10-15 11:17:51 +01:00
RALOVICH, Kristóf
b87e8ae0f5 glx: indent -br -i3 -npcs --no-tabs glxhash.h 2008-10-15 11:17:50 +01:00
RALOVICH, Kristóf
b7f76587b8 glx: indent -br -i3 -npcs --no-tabs glxext.c 2008-10-15 11:17:49 +01:00
RALOVICH, Kristóf
3959d457d6 glx: indent -br -i3 -npcs --no-tabs glxcurrent.c 2008-10-15 11:17:49 +01:00
RALOVICH, Kristóf
c6ea997137 glx: indent -br -i3 -npcs --no-tabs glxcmds.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
b928a12ee3 glx: indent -br -i3 -npcs --no-tabs glcontextmodes.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
7f04f8ddee glx: indent -br -i3 -npcs --no-tabs eval.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
a1a2078f71 glx: indent -br -i3 -npcs --no-tabs drisw_glx.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
79d830ce5d glx: indent -br -i3 -npcs --no-tabs dri_glx.c 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
e7970d6b17 glx: indent -br -i3 -npcs --no-tabs dri_common.h 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
321a73d9d5 glx: indent -br -i3 -npcs --no-tabs dri_common.c 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
9ca7330be3 glx: indent -br -i3 -npcs --no-tabs dri2.h 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
ae5b588dc9 glx: indent -br -i3 -npcs --no-tabs dri2_glx.c 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
0965740c49 glx: indent -br -i3 -npcs --no-tabs dri2.c 2008-10-15 11:17:46 +01:00
RALOVICH, Kristóf
7d16aaadf1 glx: indent -br -i3 -npcs --no-tabs compsize.c 2008-10-15 11:17:46 +01:00
RALOVICH, Kristóf
109f3f709f glx: indent -br -i3 -npcs --no-tabs clientattrib.c 2008-10-15 11:17:46 +01:00
RALOVICH, Kristóf
696bf66fa9 glx: add a line of Emacs helping variables 2008-10-15 11:17:46 +01:00
RALOVICH, Kristóf
4f31200a33 glx: No need to zero a local variable.
My previous commit e206034863 introduced this.
2008-10-15 11:17:45 +01:00
RALOVICH, Kristóf
b4bb29cecd glx: make INIT_MESA_SPARC more robust
Embed the macro body into do { ... } while(0) .
2008-10-15 11:17:45 +01:00
Jakob Bornecrantz
c9122c0c03 mesa: Remove left over merge conflicts 2008-09-22 12:47:57 +02:00
Keith Whitwell
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
Adam Jackson
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
Brian
19d9c81b8c glx: re-add glapi/ path 2008-09-18 21:22:08 -06:00
Brian
4eb95ce807 glx: added "glapi/" prefix to include 2008-09-18 20:27:16 -06:00
Chris Rankin
8d41e4536d mesa: fix asst path/include mistakes in prev commits 2008-09-18 16:48:11 -06:00
Brian Paul
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
Brian Paul
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