Attachment 38090 Details for Bug 29745 – glsl: Include only main/core.h.

[patch] glsl: Include only main/core.h.

0002-glsl-Include-main-core.h.patch (text/plain), 7.72 KB, created by Chia-I Wu on 2010-08-23 04:08:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chia-I Wu

Created: 2010-08-23 04:08:09 UTC

Size: 7.72 KB

patch

obsolete

>From b74c330932f2d55c5326ebb0dee5ab95ce8134d1 Mon Sep 17 00:00:00 2001
>From: Chia-I Wu <olv@lunarg.com>
>Date: Mon, 23 Aug 2010 17:51:42 +0800
>Subject: [PATCH 2/2] glsl: Include main/core.h.
>
>Make glsl include only main/core.h from core mesa.
>---
> src/glsl/ast_function.cpp                    |    2 +-
> src/glsl/ast_to_hir.cpp                      |    3 +--
> src/glsl/builtin_function.cpp                |    2 +-
> src/glsl/builtin_variables.h                 |    2 +-
> src/glsl/builtins/tools/generate_builtins.py |    2 +-
> src/glsl/glcpp/glcpp-parse.c                 |    2 +-
> src/glsl/glcpp/glcpp-parse.y                 |    2 +-
> src/glsl/glsl_parser_extras.cpp              |    2 +-
> src/glsl/glsl_types.cpp                      |    2 +-
> src/glsl/hir_field_selection.cpp             |    1 -
> src/glsl/ir.cpp                              |    3 +--
> src/glsl/ir_constant_expression.cpp          |    2 +-
> src/glsl/ir_set_program_inouts.cpp           |    2 +-
> src/glsl/ir_variable.cpp                     |    1 -
> src/glsl/link_functions.cpp                  |    2 +-
> src/glsl/linker.cpp                          |    5 +----
> src/glsl/program.h                           |    8 +-------
> 17 files changed, 15 insertions(+), 28 deletions(-)
>
>diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
>index f85b308..34b0f70 100644
>--- a/src/glsl/ast_function.cpp
>+++ b/src/glsl/ast_function.cpp
>@@ -25,7 +25,7 @@
> #include "ast.h"
> #include "glsl_types.h"
> #include "ir.h"
>-#include "main/macros.h"
>+#include "main/core.h" /* for MIN2 */
> 
> static ir_rvalue *
> convert_component(ir_rvalue *src, const glsl_type *desired_type);
>diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
>index b60bb2f..38a3aa2 100644
>--- a/src/glsl/ast_to_hir.cpp
>+++ b/src/glsl/ast_to_hir.cpp
>@@ -49,8 +49,7 @@
>  * parser (and lexer) sources.
>  */
> 
>-#include "main/imports.h"
>-#include "main/extensions.h"
>+#include "main/core.h" /* for struct gl_extensions */
> #include "glsl_symbol_table.h"
> #include "glsl_parser_extras.h"
> #include "ast.h"
>diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
>index b4138d0..84a66ac 100644
>--- a/src/glsl/builtin_function.cpp
>+++ b/src/glsl/builtin_function.cpp
>@@ -23,7 +23,7 @@
>  */
> 
> #include <stdio.h>
>-#include "main/compiler.h"
>+#include "main/core.h" /* for struct gl_shader */
> #include "glsl_parser_extras.h"
> #include "ir_reader.h"
> #include "program.h"
>diff --git a/src/glsl/builtin_variables.h b/src/glsl/builtin_variables.h
>index 2ec7d62..a7dbe48 100644
>--- a/src/glsl/builtin_variables.h
>+++ b/src/glsl/builtin_variables.h
>@@ -21,7 +21,7 @@
>  * DEALINGS IN THE SOFTWARE.
>  */
> 
>-#include "main/mtypes.h"
>+#include "main/core.h" /* for slot numbers */
> 
> struct builtin_variable {
>    enum ir_variable_mode mode;
>diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
>index d793c28..6a03f38 100755
>--- a/src/glsl/builtins/tools/generate_builtins.py
>+++ b/src/glsl/builtins/tools/generate_builtins.py
>@@ -115,7 +115,7 @@ if __name__ == "__main__":
>  */
> 
> #include <stdio.h>
>-#include "main/compiler.h"
>+#include "main/core.h" /* for struct gl_shader */
> #include "glsl_parser_extras.h"
> #include "ir_reader.h"
> #include "program.h"
>diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
>index 2c04d7d..91eb0bf 100644
>--- a/src/glsl/glcpp/glcpp-parse.c
>+++ b/src/glsl/glcpp/glcpp-parse.c
>@@ -100,7 +100,7 @@
> #include <inttypes.h>
> 
> #include "glcpp.h"
>-#include "main/mtypes.h"
>+#include "main/core.h" /* for struct gl_extensions */
> 
> #define glcpp_print(stream, str) stream = talloc_strdup_append(stream, str)
> #define glcpp_printf(stream, fmt, args, ...) \
>diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
>index 3275496..3c28edf 100644
>--- a/src/glsl/glcpp/glcpp-parse.y
>+++ b/src/glsl/glcpp/glcpp-parse.y
>@@ -29,7 +29,7 @@
> #include <inttypes.h>
> 
> #include "glcpp.h"
>-#include "main/mtypes.h"
>+#include "main/core.h" /* for struct gl_extensions */
> 
> #define glcpp_print(stream, str) stream = talloc_strdup_append(stream, str)
> #define glcpp_printf(stream, fmt, args, ...) \
>diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
>index b864218..bc56e4f 100644
>--- a/src/glsl/glsl_parser_extras.cpp
>+++ b/src/glsl/glsl_parser_extras.cpp
>@@ -27,7 +27,7 @@
> 
> extern "C" {
> #include <talloc.h>
>-#include "main/mtypes.h"
>+#include "main/core.h" /* for struct __GLcontextRec */
> }
> 
> #include "ast.h"
>diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
>index 8e80cf9..d8fdd1e 100644
>--- a/src/glsl/glsl_types.cpp
>+++ b/src/glsl/glsl_types.cpp
>@@ -23,7 +23,7 @@
> 
> #include <cstdio>
> #include <stdlib.h>
>-#include "main/compiler.h"
>+#include "main/core.h" /* for Elements */
> #include "glsl_symbol_table.h"
> #include "glsl_parser_extras.h"
> #include "glsl_types.h"
>diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
>index 23045ff..3c33127 100644
>--- a/src/glsl/hir_field_selection.cpp
>+++ b/src/glsl/hir_field_selection.cpp
>@@ -22,7 +22,6 @@
>  */
> 
> #include "ir.h"
>-#include "main/imports.h"
> #include "program/symbol_table.h"
> #include "glsl_parser_extras.h"
> #include "ast.h"
>diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
>index ebb5927..351dfa1 100644
>--- a/src/glsl/ir.cpp
>+++ b/src/glsl/ir.cpp
>@@ -21,8 +21,7 @@
>  * DEALINGS IN THE SOFTWARE.
>  */
> #include <string.h>
>-#include "main/imports.h"
>-#include "main/macros.h"
>+#include "main/core.h" /* for MAX2 */
> #include "ir.h"
> #include "ir_visitor.h"
> #include "glsl_types.h"
>diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
>index 54f14d1..aca5b47 100644
>--- a/src/glsl/ir_constant_expression.cpp
>+++ b/src/glsl/ir_constant_expression.cpp
>@@ -34,7 +34,7 @@
>  */
> 
> #include <math.h>
>-#include "main/macros.h"
>+#include "main/core.h" /* for MAX2, MIN2, CLAMP */
> #include "ir.h"
> #include "ir_visitor.h"
> #include "glsl_types.h"
>diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp
>index 534f602..b3f1cc0 100644
>--- a/src/glsl/ir_set_program_inouts.cpp
>+++ b/src/glsl/ir_set_program_inouts.cpp
>@@ -35,7 +35,7 @@
>  */
> 
> extern "C" {
>-#include "main/mtypes.h"
>+#include "main/core.h" /* for struct gl_program */
> #include "program/hash_table.h"
> }
> #include "ir.h"
>diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
>index 917c067..e638c96 100644
>--- a/src/glsl/ir_variable.cpp
>+++ b/src/glsl/ir_variable.cpp
>@@ -21,7 +21,6 @@
>  * DEALINGS IN THE SOFTWARE.
>  */
> 
>-#include "main/compiler.h"
> #include "ir.h"
> #include "glsl_parser_extras.h"
> #include "glsl_symbol_table.h"
>diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
>index dfda05f..6374573 100644
>--- a/src/glsl/link_functions.cpp
>+++ b/src/glsl/link_functions.cpp
>@@ -29,7 +29,7 @@ extern "C" {
> #include <talloc.h>
> }
> 
>-#include "main/mtypes.h"
>+#include "main/core.h"
> #include "glsl_symbol_table.h"
> #include "glsl_parser_extras.h"
> #include "ir.h"
>diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
>index 2dc5697..badf7ef 100644
>--- a/src/glsl/linker.cpp
>+++ b/src/glsl/linker.cpp
>@@ -72,10 +72,7 @@ extern "C" {
> #include <talloc.h>
> }
> 
>-#include "main/compiler.h"
>-#include "main/mtypes.h"
>-#include "main/macros.h"
>-#include "main/shaderobj.h"
>+#include "main/core.h"
> #include "glsl_symbol_table.h"
> #include "ir.h"
> #include "program.h"
>diff --git a/src/glsl/program.h b/src/glsl/program.h
>index ea2c4ab..893169b 100644
>--- a/src/glsl/program.h
>+++ b/src/glsl/program.h
>@@ -21,13 +21,7 @@
>  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>  */
> 
>-#include <GL/gl.h>
>-#include "main/mtypes.h"
>-
>-extern "C" {
>-#include "program/prog_parameter.h"
>-#include "program/prog_uniform.h"
>-}
>+#include "main/core.h"
> 
> extern void
> link_shaders(GLcontext *ctx, struct gl_shader_program *prog);
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 29745: 38089 | 38090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.