AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri: Remove what's left of utils.[ch]

Browse Source 
Which is just moving the struct definition for __DRIconfigRec into
dri_util.h.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16377>
This commit is contained in:
Adam Jackson
2022-05-06 15:31:26 -04:00
committed by Marge Bot
parent 5eccb228ba
commit 2a47c30ef9
9 changed files with 5 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/dri/dri_context.c
-2
View File
@@ -29,8 +29,6 @@
* Author: Jakob Bornecrantz <wallbraker@gmail.com>
*/
#include "utils.h"
#include "dri_screen.h"
#include "dri_drawable.h"
#include "dri_context.h"
src/gallium/frontends/dri/dri_query_renderer.c
-1
View File
@@ -3,7 +3,6 @@
#include "util/u_inlines.h"
#include "frontend/drm_driver.h"
#include "utils.h"
#include "dri_screen.h"
#include "dri_query_renderer.h"
#include "pipe-loader/pipe_loader.h"
src/gallium/frontends/dri/dri_screen.c
-2
View File
@@ -29,8 +29,6 @@
* Author: Jakob Bornecrantz <wallbraker@gmail.com>
*/
#include "utils.h"
#include "dri_screen.h"
#include "dri_context.h"
#include "dri_helpers.h"
src/gallium/frontends/dri/dri_util.c
-1
View File
@@ -43,7 +43,6 @@
#include "dri_util.h"
#include "dri_context.h"
#include "dri_screen.h"
#include "utils.h"
#include "util/u_endian.h"
#include "util/driconf.h"
#include "main/framebuffer.h"
src/gallium/frontends/dri/dri_util.h
+5 -3
View File
@@ -56,13 +56,15 @@
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
#include "kopper_interface.h"
#include "main/menums.h"
#include "main/formats.h"
#include "main/glconfig.h"
#include "main/menums.h"
#include "util/xmlconfig.h"
#include <stdbool.h>
struct gl_config;
struct gl_context;
struct __DRIconfigRec {
struct gl_config modes;
};
/**
* Extensions.
src/gallium/frontends/dri/kopper.c
-1
View File
@@ -36,7 +36,6 @@
#include "driver_trace/tr_screen.h"
#include "dri_screen.h"
#include "utils.h"
#include "dri_context.h"
#include "dri_drawable.h"
#include "dri_helpers.h"
src/gallium/frontends/dri/meson.build
-2
View File
@@ -33,8 +33,6 @@ files_libdri = files(
'dri_screen.h',
'dri_util.c',
'dri_util.h',
'utils.c',
'utils.h',
)
if with_dri
src/gallium/frontends/dri/utils.c
-42
View File
@@ -1,42 +0,0 @@
/*
* (C) Copyright IBM Corporation 2002, 2004
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/**
* \file utils.c
* Utility functions for DRI drivers.
*
* \author Ian Romanick <idr@us.ibm.com>
*/
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdint.h>
#include "main/cpuinfo.h"
#include "main/extensions.h"
#include "utils.h"
#include "dri_util.h"
src/gallium/frontends/dri/utils.h
-40
View File
@@ -1,40 +0,0 @@
/*
* (C) Copyright IBM Corporation 2002, 2004
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Ian Romanick <idr@us.ibm.com>
*/
#ifndef DRI_DEBUG_H
#define DRI_DEBUG_H
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
#include "main/glconfig.h"
#include "main/formats.h"
struct __DRIconfigRec {
struct gl_config modes;
};
#endif /* DRI_DEBUG_H */