Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically Removed Whitespace #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
#
# Copyright © 2004 Scott James Remnant <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -134,7 +134,7 @@ if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
Expand Down
2 changes: 1 addition & 1 deletion configs/autoconf.in
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)

# Driver specific build vars
DRI_DIRS = @DRI_DIRS@
DRI_DIRS = @DRI_DIRS@
EGL_PLATFORMS = @EGL_PLATFORMS@
EGL_CLIENT_APIS = @EGL_CLIENT_APIS@

Expand Down
12 changes: 6 additions & 6 deletions configs/beos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONFIG_NAME = beos


DEFINES = \
-DBEOS_THREADS
-DBEOS_THREADS

MACHINE=$(shell uname -m)
ifeq ($(MACHINE), BePC)
Expand All @@ -25,14 +25,14 @@ ifeq ($(CPU), x86)
-DUSE_MMX_ASM \
-DUSE_3DNOW_ASM \
-DUSE_SSE_ASM

MESA_ASM_SOURCES = $(X86_SOURCES)
GLAPI_ASM_SOURCES = $(X86_API)

CC = gcc
CXX = g++
LD = gcc

CFLAGS = \
-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
$(DEFINES)
Expand Down Expand Up @@ -75,7 +75,7 @@ else
-lroot \
/boot/develop/lib/ppc/glue-noinit.a \
/boot/develop/lib/ppc/init_term_dyn.o \
/boot/develop/lib/ppc/start_dyn.o
/boot/develop/lib/ppc/start_dyn.o

ifdef DEBUG
CFLAGS += -g -O0
Expand All @@ -95,9 +95,9 @@ GLU_DIRS = sgi
DRIVER_DIRS = beos

# Library/program dependencies
GL_LIB_DEPS =
GL_LIB_DEPS =
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS = -lgame -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)

4 changes: 2 additions & 2 deletions configs/catamount-osmesa-pgi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Configuration for building only libOSMesa on Cray Xt3
# for the compute nodes running Catamount using the
# Portland Group compiler. The Portland Group toolchain has to be
# for the compute nodes running Catamount using the
# Portland Group compiler. The Portland Group toolchain has to be
# enabled before using "module switch PrgEnv-gnu PrgEnv-pgi" .
# This doesn't really have a lot of dependencies, so it should be usable
# on other similar systems too.
Expand Down
12 changes: 6 additions & 6 deletions configs/config.mgw
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
#
# Updated : by Heromyth, on 2007-7-21
# Email : [email protected]
# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
# The others havn't been tested yet.
# 2) The generated DLLs are *not* compatible with the ones built
# with the other compilers like VC8, especially for GLUT.
# with the other compilers like VC8, especially for GLUT.
# 3) Although more tests are needed, it can be used individually!

# The generated DLLs by MingW with STDCALL are not totally compatible
# The generated DLLs by MingW with STDCALL are not totally compatible
# with the ones linked by Microsoft's compilers.
#
# xxx_USING_STDCALL = 1 Compiling MESA with __stdcall. This is default!
#
#
# xxx_USING_STDCALL = 0 Compiling MESA without __stdcall. I like this:)
#
#

# In fact, GL_USING_STDCALL and GLUT_USING_STDCALL can be
# different. For example:
#
# GL_USING_STDCALL = 0
# GLUT_USING_STDCALL = 1
#
#
# Suggested setting:
#
# ALL_USING_STDCALL = 1
Expand Down
8 changes: 4 additions & 4 deletions configs/default
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CFLAGS = -O
CXXFLAGS = -O
LDFLAGS =
HOST_CFLAGS = $(CFLAGS)
GLU_CFLAGS =
GLU_CFLAGS =

# Compiler for building demos/tests/etc
APP_CC = $(CC)
Expand All @@ -33,7 +33,7 @@ APP_CXX = $(CXX)
# Misc tools and flags
SHELL = /bin/sh
MKLIB = $(SHELL) $(TOP)/bin/mklib
MKLIB_OPTIONS =
MKLIB_OPTIONS =
MKDEP = makedepend
MKDEP_OPTIONS = -fdepend
MAKE = make
Expand Down Expand Up @@ -83,7 +83,7 @@ GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
VG_LIB_GLOB = $(VG_LIB_NAME)*

# Optional assembly language optimization files for libGL
MESA_ASM_SOURCES =
MESA_ASM_SOURCES =

# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
# order to build the Motif widget too)
Expand All @@ -101,7 +101,7 @@ DRIVER_DIRS = x11 osmesa
# EGL drivers to build
EGL_DRIVERS_DIRS = glx

# Gallium directories and
# Gallium directories and
GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS_DIRS = softpipe trace rbug identity galahad i915 i965 svga r300 nvfx nv50 failover
Expand Down
6 changes: 3 additions & 3 deletions configs/freebsd-dri
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)

CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES)
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES)

# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing

ASM_SOURCES =
MESA_ASM_SOURCES =
ASM_SOURCES =
MESA_ASM_SOURCES =

# Library/program dependencies
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
Expand Down
2 changes: 1 addition & 1 deletion configs/freebsd-dri-x86
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include $(TOP)/configs/freebsd-dri
CONFIG_NAME = freebsd-dri-x86

# Unnecessary on x86, generally.
PIC_FLAGS =
PIC_FLAGS =

ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
MESA_ASM_SOURCES = $(X86_SOURCES)
Expand Down
10 changes: 5 additions & 5 deletions configs/hpux10-static
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++
4 changes: 2 additions & 2 deletions configs/linux-dri
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GLUT_CFLAGS = -fexceptions
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing

MESA_ASM_SOURCES =
MESA_ASM_SOURCES =

# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
Expand All @@ -58,7 +58,7 @@ EGL_DRIVERS_DIRS = glx

DRIVER_DIRS = dri
GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
GALLIUM_TARGET_DIRS =
GALLIUM_TARGET_DIRS =
GALLIUM_STATE_TRACKERS_DIRS = egl

DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
Expand Down
2 changes: 1 addition & 1 deletion configs/linux-dri-debug
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OPT_FLAGS = -O0 -g
ARCH_FLAGS = -DDEBUG

# Helpful to reduce the amount of stuff that gets built sometimes:
#DRI_DIRS = i915tex i915
#DRI_DIRS = i915tex i915
#DRI_DIRS = i965
#DRI_DIRS = radeon r200 r300
#DRI_DIRS = unichrome sis
Expand Down
4 changes: 2 additions & 2 deletions configs/linux-dri-xcb
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx)

CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math
$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math

CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing

MESA_ASM_SOURCES =
MESA_ASM_SOURCES =

# Library/program dependencies
EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11)
Expand Down
4 changes: 2 additions & 2 deletions configs/linux-egl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)


MESA_ASM_SOURCES =
MESA_ASM_SOURCES =

# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
Expand All @@ -53,4 +53,4 @@ DRIVER_DIRS = dri
GALLIUM_WINSYS_DIRS = egl_drm
GALLIUM_TARGET_DIRS =

DRI_DIRS = intel
DRI_DIRS = intel
2 changes: 1 addition & 1 deletion configs/linux-ia64-icc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -arch icc-istatic

GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
Expand Down
4 changes: 2 additions & 2 deletions configs/linux-indirect
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
X11_INCLUDES = -I/usr/X11R6/include

CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math
$(ASM_FLAGS) -std=c99 -ffast-math

CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing

MESA_ASM_SOURCES =
MESA_ASM_SOURCES =

# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
Expand Down
10 changes: 5 additions & 5 deletions configs/linux-static
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =

# Need to specify all libraries we may need
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \
Expand Down
10 changes: 5 additions & 5 deletions configs/linux-x86-64-static
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =

# Need to specify all libraries we may need
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
Expand Down
2 changes: 1 addition & 1 deletion configs/linux-x86-debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Configuration for Linux with x86 code, but no gcc optimizations and
# Configuration for Linux with x86 code, but no gcc optimizations and
# debugging enabled.

include $(TOP)/configs/linux-x86
Expand Down
10 changes: 5 additions & 5 deletions configs/linux-x86-static
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =

# Need to specify all libraries we may need
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \
Expand Down
4 changes: 2 additions & 2 deletions configs/psl1ght-rsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SRC_DIRS = glsl mapi/glapi mesa \
gallium gallium/winsys gallium/targets glu egl

# Build no traditional Mesa drivers:
DRIVER_DIRS =
DRIVER_DIRS =

GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)

Expand All @@ -45,7 +45,7 @@ GALLIUM_TARGET_DIRS = egl-psl1ght
GALLIUM_STATE_TRACKERS_DIRS = egl

EGL_PLATFORMS = psl1ght
EGL_DRIVERS_DIRS =
EGL_DRIVERS_DIRS =

EGL_LIB_DEPS = $(TOP)/src/gallium/targets/egl-psl1ght/libeglpsl1ght.a \
$(TOP)/src/gallium/state_trackers/egl/libegl.a
10 changes: 5 additions & 5 deletions configs/sunos4-static
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ if test "x$enable_egl" = xyes; then
[have_xcb_dri2=yes],[have_xcb_dri2=no])
PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
[have_libudev=yes],[have_libudev=no])

if test "$have_xcb_dri2" = yes; then
EGL_DRIVER_DRI2=dri2
DEFINES="$DEFINES -DHAVE_XCB_DRI2"
Expand Down
2 changes: 1 addition & 1 deletion docs/COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.

1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
Expand Down
2 changes: 1 addition & 1 deletion docs/MESA_copy_sub_buffer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
thread's current context, glXCopySubBufferMESA performs an
implicit glFlush before it returns. Subsequent OpenGL commands
may be issued immediately after calling glXCopySubBufferMESA, but
are not executed until the copy is completed.
are not executed until the copy is completed.

GLX Protocol

Expand Down
Loading