[Mesa-dev] [PATCH 02/15] virgl: rename virgl.h to virgl_screen.h
Emil Velikov
emil.l.velikov at gmail.com
Thu Oct 29 04:59:33 PDT 2015
Provide a more meaningful name considering it's purpose.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/drivers/virgl/Makefile.sources | 2 +-
src/gallium/drivers/virgl/virgl.h | 51 ------------------------------
src/gallium/drivers/virgl/virgl_context.c | 2 +-
src/gallium/drivers/virgl/virgl_context.h | 2 +-
src/gallium/drivers/virgl/virgl_screen.c | 2 +-
src/gallium/drivers/virgl/virgl_screen.h | 51 ++++++++++++++++++++++++++++++
src/gallium/drivers/virgl/virgl_texture.c | 2 +-
7 files changed, 56 insertions(+), 56 deletions(-)
delete mode 100644 src/gallium/drivers/virgl/virgl.h
create mode 100644 src/gallium/drivers/virgl/virgl_screen.h
diff --git a/src/gallium/drivers/virgl/Makefile.sources b/src/gallium/drivers/virgl/Makefile.sources
index ed309ae..c27d284 100644
--- a/src/gallium/drivers/virgl/Makefile.sources
+++ b/src/gallium/drivers/virgl/Makefile.sources
@@ -4,7 +4,6 @@ C_SOURCES := \
virgl_context.h \
virgl_encode.c \
virgl_encode.h \
- virgl.h \
virgl_hw.h \
virgl_protocol.h \
virgl_public.h \
@@ -12,6 +11,7 @@ C_SOURCES := \
virgl_resource.c \
virgl_resource.h \
virgl_screen.c \
+ virgl_screen.h \
virgl_streamout.c \
virgl_texture.c \
virgl_tgsi.c \
diff --git a/src/gallium/drivers/virgl/virgl.h b/src/gallium/drivers/virgl/virgl.h
deleted file mode 100644
index d64576c..0000000
--- a/src/gallium/drivers/virgl/virgl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2014, 2015 Red Hat.
- *
- * 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
- * THE AUTHOR(S) 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.
- */
-#ifndef VIRGL_H
-#define VIRGL_H
-
-#include "util/u_transfer.h"
-
-#include "virgl_hw.h"
-
-#include "virgl_winsys.h"
-#include "pipe/p_screen.h"
-struct virgl_screen {
- struct pipe_screen base;
- struct sw_winsys *winsys;
- struct virgl_winsys *vws;
-
- struct virgl_drm_caps caps;
-
- uint32_t sub_ctx_id;
-};
-
-
-static inline struct virgl_screen *
-virgl_screen( struct pipe_screen *pipe )
-{
- return (struct virgl_screen *)pipe;
-}
-
-#define VIRGL_MAP_BUFFER_ALIGNMENT 64
-
-#endif
diff --git a/src/gallium/drivers/virgl/virgl_context.c b/src/gallium/drivers/virgl/virgl_context.c
index 37a631a..3146459 100644
--- a/src/gallium/drivers/virgl/virgl_context.c
+++ b/src/gallium/drivers/virgl/virgl_context.c
@@ -46,7 +46,7 @@
#include "virgl_context.h"
#include "virgl_resource.h"
-#include "virgl.h"
+#include "virgl_screen.h"
#include "state_tracker/sw_winsys.h"
struct pipe_screen encscreen;
diff --git a/src/gallium/drivers/virgl/virgl_context.h b/src/gallium/drivers/virgl/virgl_context.h
index 878d786..948ea2d 100644
--- a/src/gallium/drivers/virgl/virgl_context.h
+++ b/src/gallium/drivers/virgl/virgl_context.h
@@ -27,7 +27,7 @@
#include "pipe/p_context.h"
#include "virgl_protocol.h"
-#include "virgl.h"
+#include "virgl_screen.h"
#include "util/u_slab.h"
#include "util/list.h"
#include "indices/u_primconvert.h"
diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index 2bc7f87..ebc42f4 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
+++ b/src/gallium/drivers/virgl/virgl_screen.c
@@ -34,7 +34,7 @@
#include "state_tracker/sw_winsys.h"
#include "tgsi/tgsi_exec.h"
-#include "virgl.h"
+#include "virgl_screen.h"
#include "virgl_resource.h"
#include "virgl_public.h"
#include "virgl_context.h"
diff --git a/src/gallium/drivers/virgl/virgl_screen.h b/src/gallium/drivers/virgl/virgl_screen.h
new file mode 100644
index 0000000..d64576c
--- /dev/null
+++ b/src/gallium/drivers/virgl/virgl_screen.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014, 2015 Red Hat.
+ *
+ * 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
+ * THE AUTHOR(S) 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.
+ */
+#ifndef VIRGL_H
+#define VIRGL_H
+
+#include "util/u_transfer.h"
+
+#include "virgl_hw.h"
+
+#include "virgl_winsys.h"
+#include "pipe/p_screen.h"
+struct virgl_screen {
+ struct pipe_screen base;
+ struct sw_winsys *winsys;
+ struct virgl_winsys *vws;
+
+ struct virgl_drm_caps caps;
+
+ uint32_t sub_ctx_id;
+};
+
+
+static inline struct virgl_screen *
+virgl_screen( struct pipe_screen *pipe )
+{
+ return (struct virgl_screen *)pipe;
+}
+
+#define VIRGL_MAP_BUFFER_ALIGNMENT 64
+
+#endif
diff --git a/src/gallium/drivers/virgl/virgl_texture.c b/src/gallium/drivers/virgl/virgl_texture.c
index 97d02eb..4fbdb69 100644
--- a/src/gallium/drivers/virgl/virgl_texture.c
+++ b/src/gallium/drivers/virgl/virgl_texture.c
@@ -22,7 +22,7 @@
*/
#include "util/u_memory.h"
#include "util/u_format.h"
-#include "virgl.h"
+#include "virgl_screen.h"
#include "virgl_resource.h"
#include "virgl_context.h"
--
2.6.2
More information about the mesa-dev
mailing list