fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 19:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: add INTEL_DEBUG expected value in declaration

Browse source 
Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6732>
This commit is contained in:
Marcin Ślusarz 2020-09-14 18:43:50 +02:00 • committed by Marge Bot
parent bcfec61d1e
commit 4015e1876a
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/intel/dev/gen_debug.c
View file

@ -39,7 +39,7 @@
#include "util/debug.h"
#include "c11/threads.h"
uint64_t INTEL_DEBUG = 0;
uint64_t intel_debug = 0;
static const struct debug_control debug_control[] = {
{ "tex", DEBUG_TEXTURE},
@ -117,7 +117,7 @@ intel_debug_flag_for_shader_stage(gl_shader_stage stage)
static void
brw_process_intel_debug_variable_once(void)
{
INTEL_DEBUG = parse_debug_string(getenv("INTEL_DEBUG"), debug_control);
intel_debug = parse_debug_string(getenv("INTEL_DEBUG"), debug_control);
}
void

5
src/intel/dev/gen_debug.h
View file

@ -28,6 +28,7 @@
#include <stdint.h>
#include "compiler/shader_enums.h"
#include "util/macros.h"
#ifdef __cplusplus
extern "C" {
@ -39,7 +40,9 @@ extern "C" {
* list of debugging flags, as well as some macros for handling them.
*/
extern uint64_t INTEL_DEBUG;
extern uint64_t intel_debug;
#define INTEL_DEBUG __builtin_expect(intel_debug, 0)
#define DEBUG_TEXTURE (1ull << 0)
#define DEBUG_STATE (1ull << 1)

2
src/mesa/drivers/dri/i965/intel_screen.c
View file

@ -2574,7 +2574,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && devinfo->gen < 7) {
fprintf(stderr,
"shader_time debugging requires gen7 (Ivybridge) or better.\n");
INTEL_DEBUG &= ~DEBUG_SHADER_TIME;
intel_debug &= ~DEBUG_SHADER_TIME;
}
if (intel_get_integer(screen, I915_PARAM_MMAP_GTT_VERSION) >= 1) {