AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/gallium-0.1' into gallium-0.2

Browse Source 
Conflicts:

	Makefile
	progs/demos/Makefile
	progs/glsl/Makefile
	progs/redbook/Makefile
	progs/samples/Makefile
	progs/tests/Makefile
	progs/trivial/Makefile
	progs/xdemos/Makefile
	src/gallium/Makefile
	src/mesa/main/attrib.c
	src/mesa/main/bufferobj.c
	src/mesa/vbo/vbo_exec_draw.c
This commit is contained in:
Keith Whitwell
2008-09-11 18:32:05 +01:00
parent 685248bea1 d50d68a1c9
commit cc7dd4fc1b
184 changed files with 6124 additions and 2879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/GLES/gl.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __gl_h_
#define __gl_h_
/* $Id: gl.h 4533 2007-11-26 11:19:35Z markc $ */
#include <GLES/glplatform.h>
include/GLES/glext.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __glext_h_
#define __glext_h_
/* $Id: glext.h 5687 2008-05-13 21:31:32Z oddhack $ */
#ifdef __cplusplus
extern "C" {
include/GLES/glplatform.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __glplatform_h_
#define __glplatform_h_
/* $Id: glplatform.h 4585 2007-11-30 09:49:39Z markc $ */
#ifdef __cplusplus
extern "C" {
include/GLES2/gl2.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __gl2_h_
#define __gl2_h_
/* $Id: gl2.h 5418 2008-03-26 19:57:12Z oddhack $ */
#include <GLES2/gl2platform.h>
include/GLES2/gl2ext.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __gl2ext_h_
#define __gl2ext_h_
/* $Id: gl2ext.h 5767 2008-06-02 17:44:20Z benj $ */
#ifdef __cplusplus
extern "C" {
include/GLES2/gl2platform.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __gl2platform_h_
#define __gl2platform_h_
/* $Id: gl2platform.h 4532 2007-11-26 11:12:44Z markc $ */
#ifdef __cplusplus
extern "C" {