Module: Mesa
Branch: master
Commit: de42431a9d761305c9911f30b5880a9a049a2d60
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=de42431a9d761305c9911f30b5880a9a049a2d60
Author: Brian Paul <bri...@vmware.com>
Date: Mon Dec 15 16:45:57 2014 -0700
main: remove extern C around #includes in ff_fragment_shader.cpp
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com>
Reviewed-by: Jose Fonseca <jfons...@vmware.com>
---
src/mesa/main/ff_fragment_shader.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/ff_fragment_shader.cpp
b/src/mesa/main/ff_fragment_shader.cpp
index 5591d57..bc6fdbd 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -27,13 +27,15 @@
*
**************************************************************************/
-extern "C" {
#include "glheader.h"
#include "imports.h"
#include "mtypes.h"
#include "main/context.h"
#include "main/macros.h"
#include "main/samplerobj.h"
+#include "main/texenvprogram.h"
+#include "main/texobj.h"
+#include "main/uniforms.h"
#include "program/program.h"
#include "program/prog_parameter.h"
#include "program/prog_cache.h"
@@ -41,10 +43,6 @@ extern "C" {
#include "program/prog_print.h"
#include "program/prog_statevars.h"
#include "program/programopt.h"
-#include "texenvprogram.h"
-#include "texobj.h"
-}
-#include "main/uniforms.h"
#include "../glsl/glsl_types.h"
#include "../glsl/ir.h"
#include "../glsl/ir_builder.h"
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
