Commit e5339fe4 authored by Marek Olšák's avatar Marek Olšák Committed by Marge Bot

Move compiler.h and imports.h/c from src/mesa/main into src/util

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com
Part-of: <!4324>
parent 6cfe074b
......@@ -71,7 +71,6 @@ if env['msvc']:
# Copy these files to avoid generation object files into src/mesa/program
env.Prepend(CPPPATH = ['#src/mesa/main'])
env.Command('glsl/imports.c', '#src/mesa/main/imports.c', Copy('$TARGET', '$SOURCE'))
env.Command('glsl/extensions_table.c', '#src/mesa/main/extensions_table.c', Copy('$TARGET', '$SOURCE'))
# Copy these files to avoid generation object files into src/mesa/program
env.Prepend(CPPPATH = ['#src/mesa/program'])
......@@ -82,7 +81,6 @@ compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
mesa_objs = env.StaticObject([
'glsl/extensions_table.c',
'glsl/imports.c',
'glsl/symbol_table.c',
'glsl/dummy_errors.c',
])
......
......@@ -26,7 +26,7 @@
#include "gl_nir.h"
#include "ir_uniform.h"
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
static nir_ssa_def *
......
......@@ -61,7 +61,7 @@
#include "gl_nir.h"
#include "ir_uniform.h"
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
struct lower_samplers_as_deref_state {
......
......@@ -37,7 +37,7 @@
#include "compiler/nir/nir_builtin_builder.h"
#include "compiler/nir/nir_deref.h"
#include "main/errors.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/mtypes.h"
#include "main/shaderobj.h"
#include "util/u_math.h"
......
......@@ -22,7 +22,7 @@
*/
#include <string.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "ir.h"
#include "compiler/glsl_types.h"
#include "util/hash_table.h"
......
......@@ -86,7 +86,7 @@
#include "util/u_string.h"
#include "util/u_math.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/shaderobj.h"
#include "main/enums.h"
#include "main/mtypes.h"
......
......@@ -22,7 +22,7 @@
*/
#include <gtest/gtest.h>
#include "standalone_scaffolding.h"
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "ir.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "util/ralloc.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "ir.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "util/ralloc.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "ir.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "ir.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "util/ralloc.h"
......
......@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <gtest/gtest.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "util/ralloc.h"
......
......@@ -26,7 +26,7 @@
*/
#include "nir.h"
#include <main/imports.h>
#include <util/imports.h>
/**
* SSA-based copy propagation
......
......@@ -39,7 +39,7 @@
#include <GL/glxproto.h>
#include "xm_api.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/errors.h"
#include "util/u_math.h"
......
......@@ -70,7 +70,7 @@
#include "hud/hud_context.h"
#include "main/errors.h"
#include "main/imports.h"
#include "util/imports.h"
#include "xm_public.h"
#include <GL/glx.h>
......
......@@ -43,7 +43,7 @@
#define BRW_REG_H
#include <stdbool.h>
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/macros.h"
#include "program/prog_instruction.h"
#include "brw_eu_defines.h"
......
......@@ -52,7 +52,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
def printRealHeader(self):
print('#include "main/glheader.h"')
print('#include "main/enums.h"')
print('#include "main/imports.h"')
print('#include "util/imports.h"')
print('#include "main/mtypes.h"')
print('')
print('typedef struct PACKED {')
......
......@@ -89,7 +89,7 @@ header = """/**
#include "main/genmipmap.h"
#include "main/hint.h"
#include "main/histogram.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/light.h"
#include "main/lines.h"
#include "main/matrix.h"
......
......@@ -100,6 +100,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
* can SET_FuncName, are used to get and set the dispatch pointer for the
* named function in the specified dispatch table.
*/
#include "main/glheader.h"
""")
return
......
......@@ -43,7 +43,6 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
main/extensions_table.c \
main/imports.c \
program/symbol_table.c \
program/dummy_errors.c
......
......@@ -43,7 +43,6 @@ MAIN_FILES = \
main/colortab.h \
main/compute.c \
main/compute.h \
main/compiler.h \
main/condrender.c \
main/condrender.h \
main/config.h \
......@@ -138,8 +137,6 @@ MAIN_FILES = \
main/histogram.h \
main/image.c \
main/image.h \
main/imports.c \
main/imports.h \
main/light.c \
main/light.h \
main/lines.c \
......
......@@ -24,7 +24,7 @@
#include "main/glheader.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/accum.h"
#include "main/arrayobj.h"
#include "main/context.h"
......
......@@ -33,7 +33,7 @@
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/arbprogram.h"
#include "main/arrayobj.h"
#include "main/blend.h"
......
......@@ -24,7 +24,7 @@
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/arbprogram.h"
#include "main/arrayobj.h"
#include "main/blend.h"
......
......@@ -28,7 +28,7 @@
#include "i830_context.h"
#include "main/api_exec.h"
#include "main/extensions.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/version.h"
#include "main/vtxfmt.h"
#include "tnl/tnl.h"
......
......@@ -29,7 +29,7 @@
#include "main/api_exec.h"
#include "main/framebuffer.h"
#include "main/extensions.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/version.h"
#include "main/vtxfmt.h"
......
......@@ -29,7 +29,8 @@
#include "i915_reg.h"
#include "i915_debug.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/glheader.h"
static const char *opcodes[0x20] = {
"NOP",
......
......@@ -29,7 +29,7 @@
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/renderbuffer.h"
#include "main/framebuffer.h"
......
......@@ -26,7 +26,7 @@
**************************************************************************/
#include "main/imports.h"
#include "util/imports.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "main/bufferobj.h"
......
......@@ -31,7 +31,7 @@
#include "main/extensions.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/points.h"
#include "main/renderbuffer.h"
......
......@@ -27,7 +27,7 @@
#include "main/enums.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
......
......@@ -33,7 +33,7 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/macros.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/mtypes.h"
#include "main/enums.h"
......
......@@ -38,7 +38,7 @@
* performance bottleneck, though.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "intel_context.h"
#include "intel_batchbuffer.h"
......
......@@ -30,7 +30,7 @@
* (GL_NV_conditional_render, GL_ARB_conditional_render_inverted) on Gen7+.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/condrender.h"
#include "brw_context.h"
......
......@@ -37,7 +37,7 @@
#include "main/fbobject.h"
#include "main/extensions.h"
#include "main/glthread.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/points.h"
#include "main/version.h"
......
......@@ -27,7 +27,7 @@
* The driver implementation of the GL_APPLE_object_purgeable extension.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "main/bufferobj.h"
......
......@@ -25,7 +25,7 @@
*
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/bufferobj.h"
#include "main/varray.h"
#include "vbo/vbo.h"
......
......@@ -30,7 +30,7 @@
*/
#include <pthread.h>
#include "main/imports.h"
#include "util/imports.h"
#include "main/glspirv.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
......
......@@ -44,7 +44,7 @@
* big we throw out all of the cache data and let it get regenerated.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/streaming-load-memcpy.h"
#include "x86/common_x86_asm.h"
#include "intel_batchbuffer.h"
......
......@@ -35,7 +35,7 @@
* appropriately synced with the stage of the pipeline for our extensions'
* needs.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/queryobj.h"
#include "brw_context.h"
......
......@@ -40,7 +40,7 @@
#include <libsync.h> /* Requires Android or libdrm-2.4.72 */
#include "main/imports.h"
#include "util/imports.h"
#include "brw_context.h"
#include "intel_batchbuffer.h"
......
......@@ -30,7 +30,7 @@
*/
#include "main/compiler.h"
#include "util/compiler.h"
#include "main/context.h"
#include "brw_context.h"
#include "brw_vs.h"
......
......@@ -31,7 +31,7 @@
* GL_EXT_transform_feedback, and friends) on platforms that support
* hardware contexts (Gen6+).
*/
#include "main/imports.h"
#include "util/imports.h"
#include "brw_context.h"
#include "brw_defines.h"
......
......@@ -26,7 +26,7 @@
*
* Support for query buffer objects (GL_ARB_query_buffer_object) on Haswell+.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "brw_context.h"
#include "brw_defines.h"
......
......@@ -29,7 +29,7 @@
* This provides core GL buffer object functionality.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "main/streaming-load-memcpy.h"
......
......@@ -24,7 +24,7 @@
*/
#include "main/enums.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
......
......@@ -28,7 +28,7 @@
* Batched upload via BOs.
*/
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "brw_bufmgr.h"
#include "brw_context.h"
......
......@@ -27,7 +27,7 @@
#ifndef __NOUVEAU_DRIVER_H__
#define __NOUVEAU_DRIVER_H__
#include "main/imports.h"
#include "util/imports.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "main/formats.h"
......
......@@ -32,7 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "main/glheader.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/context.h"
#include "util/simple_list.h"
......
......@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/api_arrayelt.h"
#include "main/api_exec.h"
#include "main/context.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/extensions.h"
#include "main/version.h"
#include "main/vtxfmt.h"
......
......@@ -36,7 +36,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <errno.h>
#include "main/glheader.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/context.h"
#include "swrast/swrast.h"
......
......@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/macros.h"
#include "main/state.h"
......
......@@ -35,7 +35,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <errno.h>
#include "main/glheader.h"
#include "main/imports.h"
#include "util/imports.h"
#include "r200_context.h"
#include "r200_sanity.h"
......
......@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "main/glheader.h"
#include "main/imports.h"
#include "util/imports.h"
#include "main/enums.h"
#include "main/light.h"
#include "main/framebuffer.h"
......
......@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/errors.h"
#include "main/glheader.h"
#include "main/imports.h"
#include "util/imports.h"