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

st/dri: inline dri2_buffer.h within dri2.c

Browse source 
The header was used only by dri2.c, containing a two-member struct and cast wrapper.
Just inline it where it's used/needed.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Emil Velikov 2018-08-24 14:05:59 +01:00 • committed by Emil Velikov
parent 89c2c386c0
commit 80b62e2d6d
4 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/state_trackers/dri/Makefile.sources
View file

@ -11,8 +11,7 @@ common_SOURCES := \
dri_screen.h
dri2_SOURCES := \
dri2.c \
dri2_buffer.h
dri2.c
drisw_SOURCES := \
drisw.c

15
src/gallium/state_trackers/dri/dri2.c
View file

@ -45,15 +45,28 @@
#include "main/bufferobj.h"
#include "main/texobj.h"
#include "dri_util.h"
#include "dri_helpers.h"
#include "dri_drawable.h"
#include "dri_query_renderer.h"
#include "dri2_buffer.h"
#ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
#endif
struct dri2_buffer
{
__DRIbuffer base;
struct pipe_resource *resource;
};
static inline struct dri2_buffer *
dri2_buffer(__DRIbuffer * driBufferPriv)
{
return (struct dri2_buffer *) driBufferPriv;
}
static const int fourcc_formats[] = {
__DRI_IMAGE_FOURCC_ARGB2101010,
__DRI_IMAGE_FOURCC_XRGB2101010,

22
src/gallium/state_trackers/dri/dri2_buffer.h
View file

@ -1,22 +0,0 @@
#ifndef DRI2_BUFFER_H
#define DRI2_BUFFER_H
#include "dri_util.h"
struct pipe_surface;
struct dri2_buffer
{
__DRIbuffer base;
struct pipe_resource *resource;
};
static inline struct dri2_buffer *
dri2_buffer(__DRIbuffer * driBufferPriv)
{
return (struct dri2_buffer *) driBufferPriv;
}
#endif
/* vim: set sw=3 ts=8 sts=3 expandtab: */

2
src/gallium/state_trackers/dri/meson.build
View file

@ -38,7 +38,7 @@ if with_dri
endif
if with_dri2
files_libdri += files('dri2.c', 'dri2_buffer.h')
files_libdri += files('dri2.c')
endif
libdri_c_args = []