projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
main
/
version.h
diff --git
a/src/mesa/main/version.h
b/src/mesa/main/version.h
index d4d3dd1a94e1dfb87712b4c3a185b65e02ae7adc..6552a3a784369d2d93a876fcaa38079b87322ad2 100644
(file)
--- a/
src/mesa/main/version.h
+++ b/
src/mesa/main/version.h
@@
-1,6
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 7.
6
+ * Version: 7.
10
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
* Copyright (C) 2009 VMware, Inc. All Rights Reserved.
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
* Copyright (C) 2009 VMware, Inc. All Rights Reserved.
@@
-28,11
+28,14
@@
#define VERSION_H
#define VERSION_H
+#include "mtypes.h"
+
+
/* Mesa version */
#define MESA_MAJOR 7
/* Mesa version */
#define MESA_MAJOR 7
-#define MESA_MINOR
6
+#define MESA_MINOR
10
#define MESA_PATCH 0
#define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.
6
-devel"
+#define MESA_VERSION_STRING "7.
10
-devel"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
@@
-50,4
+53,8
@@
#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR, OPENGL_PATCH)
#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR, OPENGL_PATCH)
+extern void
+_mesa_compute_version(struct gl_context *ctx);
+
+
#endif /* VERSION_H */
#endif /* VERSION_H */