util/os_memory: never use os_memory_debug.h

This is currently broken hard, because this code is being used in more
places that it used to be, and fixing that is prohibitively hard right
now.

This is far from ideal, as it leaves the same inconsistency in the
EMBEDDED_DEVICE code-path. But that only used by VMWare, so it's
probably better if they fix it, as they know their requirements better
than we do.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2911
Fixes: 76f79db3f5d ("util: stop including files from mesa/main")
Acked-by: Jose Fonseca <jfonseca@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4919>

diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index b4cf7b7d6672bd58760541e7adb324c8769a2631..f5064da9f292b41bafa7e37d9af0c7a6f446eea1 100644 (file)
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
@@ -112,10 +112,6 @@ stw_init(const struct stw_winsys *stw_winsys)
    stw_dev = &stw_dev_storage;
    memset(stw_dev, 0, sizeof(*stw_dev));
 
    stw_dev = &stw_dev_storage;
    memset(stw_dev, 0, sizeof(*stw_dev));
 

-#ifdef DEBUG
-   stw_dev->memdbg_no = debug_memory_begin();
-#endif
-

    stw_dev->stw_winsys = stw_winsys;
 
    stw_dev->stapi = stw_st_create_api();
    stw_dev->stw_winsys = stw_winsys;
 
    stw_dev->stapi = stw_st_create_api();


@@ -230,10 +226,6 @@ stw_cleanup(void)
    _glapi_destroy_multithread();
 #endif
 
    _glapi_destroy_multithread();
 #endif
 

-#ifdef DEBUG
-   debug_memory_end(stw_dev->memdbg_no);
-#endif
-

    stw_tls_cleanup();
 
    stw_dev = NULL;
    stw_tls_cleanup();
 
    stw_dev = NULL;

diff --git a/src/util/os_memory.h b/src/util/os_memory.h
index bfb708151184808132597e5bb584365d3693000e..b191cf205840803cf20f4ed5eccb4feb9ab8d925 100644 (file)
--- a/src/util/os_memory.h
+++ b/src/util/os_memory.h
@@ -34,8 +34,6 @@
 #ifndef _OS_MEMORY_H_
 #define _OS_MEMORY_H_
 
 #ifndef _OS_MEMORY_H_
 #define _OS_MEMORY_H_
 

-#include "detect_os.h"
-

 #if defined(EMBEDDED_DEVICE)
 
 #ifdef __cplusplus
 #if defined(EMBEDDED_DEVICE)
 
 #ifdef __cplusplus


@@ -67,10 +65,6 @@ os_realloc_aligned(void *ptr, size_t oldsize, size_t newsize, size_t alignemnt);
 }
 #endif
 
 }
 #endif
 

-#elif DETECT_OS_WINDOWS && defined(DEBUG) && !defined(DEBUG_MEMORY_IMPLEMENTATION)
-
-#  include "os_memory_debug.h"
-

 #else
 
 #  include "os_memory_stdc.h"
 #else
 
 #  include "os_memory_stdc.h"