mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-26 02:00:12 +01:00
mesa: move src/mapi to src/mesa/glapi
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36562>
This commit is contained in:
Marek Olšák
Marge Bot
parent
0a0ec32a84
commit
8f2532453c
189 changed files with 26 additions and 29 deletions
|
|
@ -64,7 +64,7 @@
|
|||
#include "GL/mesa_glinterop.h"
|
||||
#include "pipe-loader/pipe_loader.h"
|
||||
#include "loader/loader.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
#include "pipe/p_screen.h"
|
||||
#include "util/bitscan.h"
|
||||
#include "util/driconf.h"
|
||||
|
|
@ -76,7 +76,6 @@
|
|||
#include "util/u_vector.h"
|
||||
#include "egl_dri2.h"
|
||||
#include "egldefines.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "dispatch.h"
|
||||
|
||||
#define NUM_ATTRIBS 16
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
#include "pipe/p_defines.h"
|
||||
#include "state_tracker/st_context.h"
|
||||
#include "util/u_atomic.h"
|
||||
#include <mapi/glapi/glapi.h>
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
|
||||
#include "hgl/hgl_sw_winsys.h"
|
||||
#include "hgl_context.h"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
#include <pipe/p_state.h>
|
||||
|
||||
#include "util/u_call_once.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
#include "dispatch.h"
|
||||
|
||||
#include <GL/mesa_glinterop.h>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ import sys
|
|||
import textwrap
|
||||
|
||||
import os
|
||||
NEWAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mapi", "new")
|
||||
NEWAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mesa", "glapi", "new")
|
||||
sys.path.insert(0, NEWAPI)
|
||||
import genCommon
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "c11/threads.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
#include "util/detect_os.h"
|
||||
#include "util/macros.h"
|
||||
#include "util/perf/cpu_trace.h"
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
#include "main/errors.h"
|
||||
#include "main/config.h"
|
||||
#include "dispatch.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
#include "util/compiler.h"
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include <string.h>
|
||||
#include "util/compiler.h"
|
||||
#include "GL/glx.h"
|
||||
#include "glapi/glapi.h"
|
||||
#include "glapi/glapi/glapi.h"
|
||||
|
||||
|
||||
struct name_address_pair {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include <GL/glx.h>
|
||||
#include "main/errors.h"
|
||||
#include "dispatch.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
|
||||
|
||||
/* Some debugging info. */
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include <windows.h>
|
||||
|
||||
#include "glapi/glapi.h"
|
||||
#include "glapi/glapi/glapi.h"
|
||||
#include "util/u_debug.h"
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include <GL/wglext.h>
|
||||
#include <GL/mesa_glinterop.h>
|
||||
|
||||
#include "glapi/glapi.h"
|
||||
#include "glapi/glapi/glapi.h"
|
||||
#include "stw_device.h"
|
||||
#include "stw_gdishim.h"
|
||||
#include "gldrv.h"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
#include "kopper_interface.h"
|
||||
#include "loader_dri_helper.h"
|
||||
#include "dri_util.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
#include "dispatch.h"
|
||||
|
||||
static int xshm_error = 0;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#ifdef GLX_DIRECT_RENDERING
|
||||
|
||||
#include "glxclient.h"
|
||||
#include "mapi/glapi/glapi.h"
|
||||
#include "mesa/glapi/glapi/glapi.h"
|
||||
#include "dispatch.h"
|
||||
|
||||
/* Implementation. */
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Chia-I Wu <olv@lunarg.com>
|
||||
*/
|
||||
|
||||
#include "glapi/glapi.h"
|
||||
#include "../glapi/glapi.h"
|
||||
|
||||
/* REALLY_INITIAL_EXEC implies __GLIBC__ */
|
||||
#if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC)
|
||||
|
|
@ -61,6 +61,6 @@ if with_symbols_check
|
|||
'--symbols-file', files('gles1-symbols.txt'),
|
||||
symbols_check_args,
|
||||
],
|
||||
suite : ['mapi'],
|
||||
suite : ['glapi'],
|
||||
)
|
||||
endif
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
* Chia-I Wu <olv@lunarg.com>
|
||||
*/
|
||||
|
||||
#include "glapi/glapi.h"
|
||||
#include "../glapi/glapi.h"
|
||||
|
||||
/* REALLY_INITIAL_EXEC implies __GLIBC__ */
|
||||
#if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC)
|
||||
|
|
@ -61,6 +61,6 @@ if with_symbols_check
|
|||
'--symbols-file', files('gles2-symbols.txt'),
|
||||
symbols_check_args,
|
||||
],
|
||||
suite : ['mapi'],
|
||||
suite : ['glapi'],
|
||||
)
|
||||
endif
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue