summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/vc5/Automake.inc10
-rw-r--r--src/gallium/drivers/vc5/Makefile.am28
-rw-r--r--src/gallium/drivers/vc5/Makefile.sources2
-rw-r--r--src/gallium/drivers/vc5/meson.build22
-rw-r--r--src/gallium/drivers/vc5/v3dx_simulator.c4
-rw-r--r--src/gallium/drivers/vc5/vc5_bufmgr.c2
-rw-r--r--src/gallium/drivers/vc5/vc5_context.h2
-rw-r--r--src/gallium/drivers/vc5/vc5_job.c2
-rw-r--r--src/gallium/drivers/vc5/vc5_screen.c4
-rw-r--r--src/gallium/drivers/vc5/vc5_screen.h2
-rw-r--r--src/gallium/drivers/vc5/vc5_simulator.c4
-rw-r--r--src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp4
12 files changed, 43 insertions, 43 deletions
diff --git a/src/gallium/drivers/vc5/Automake.inc b/src/gallium/drivers/vc5/Automake.inc
index 57c8a28efed..612bc21615e 100644
--- a/src/gallium/drivers/vc5/Automake.inc
+++ b/src/gallium/drivers/vc5/Automake.inc
@@ -1,10 +1,10 @@
-if HAVE_GALLIUM_VC5
+if HAVE_GALLIUM_V3D
-TARGET_DRIVERS += vc5
-TARGET_CPPFLAGS += -DGALLIUM_VC5
+TARGET_DRIVERS += v3d
+TARGET_CPPFLAGS += -DGALLIUM_V3D
TARGET_LIB_DEPS += \
- $(top_builddir)/src/gallium/winsys/vc5/drm/libvc5drm.la \
- $(top_builddir)/src/gallium/drivers/vc5/libvc5.la \
+ $(top_builddir)/src/gallium/winsys/vc5/drm/libv3ddrm.la \
+ $(top_builddir)/src/gallium/drivers/vc5/libv3d.la \
$(top_builddir)/src/broadcom/libbroadcom.la
if !HAVE_GALLIUM_VC4
diff --git a/src/gallium/drivers/vc5/Makefile.am b/src/gallium/drivers/vc5/Makefile.am
index 419c9ab8ea1..2b4c364c24e 100644
--- a/src/gallium/drivers/vc5/Makefile.am
+++ b/src/gallium/drivers/vc5/Makefile.am
@@ -26,31 +26,31 @@ AM_CFLAGS = \
-I$(top_builddir)/src/compiler/nir \
-I$(top_builddir)/src/broadcom \
$(LIBDRM_CFLAGS) \
- $(VC5_SIMULATOR_CFLAGS) \
+ $(V3D_SIMULATOR_CFLAGS) \
$(GALLIUM_DRIVER_CFLAGS) \
$(VALGRIND_CFLAGS) \
$()
noinst_LTLIBRARIES = \
- libvc5.la \
- libvc5_v33.la \
- libvc5_v41.la \
+ libv3d.la \
+ libv3d_v33.la \
+ libv3d_v41.la \
$()
-libvc5_v33_la_SOURCES = $(VC5_PER_VERSION_SOURCES)
-libvc5_v33_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=33
+libv3d_v33_la_SOURCES = $(V3D_PER_VERSION_SOURCES)
+libv3d_v33_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=33
-libvc5_v41_la_SOURCES = $(VC5_PER_VERSION_SOURCES)
-libvc5_v41_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=41
+libv3d_v41_la_SOURCES = $(V3D_PER_VERSION_SOURCES)
+libv3d_v41_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=41
-libvc5_la_SOURCES = $(C_SOURCES)
+libv3d_la_SOURCES = $(C_SOURCES)
-libvc5_la_LDFLAGS = \
- $(VC5_SIMULATOR_LIBS) \
+libv3d_la_LDFLAGS = \
+ $(V3D_SIMULATOR_LIBS) \
$(NULL)
-libvc5_la_LIBADD = \
- libvc5_v33.la \
- libvc5_v41.la \
+libv3d_la_LIBADD = \
+ libv3d_v33.la \
+ libv3d_v41.la \
$()
EXTRA_DIST = meson.build
diff --git a/src/gallium/drivers/vc5/Makefile.sources b/src/gallium/drivers/vc5/Makefile.sources
index 486857c1f03..36fcc0b90be 100644
--- a/src/gallium/drivers/vc5/Makefile.sources
+++ b/src/gallium/drivers/vc5/Makefile.sources
@@ -24,7 +24,7 @@ C_SOURCES := \
vc5_uniforms.c \
$()
-VC5_PER_VERSION_SOURCES = \
+V3D_PER_VERSION_SOURCES = \
v3dx_context.h \
v3dx_format_table.c \
v3dx_job.c \
diff --git a/src/gallium/drivers/vc5/meson.build b/src/gallium/drivers/vc5/meson.build
index 4f20c2697e5..63460dc443f 100644
--- a/src/gallium/drivers/vc5/meson.build
+++ b/src/gallium/drivers/vc5/meson.build
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-files_libvc5 = files(
+files_libv3d = files(
'vc5_blit.c',
'vc5_bufmgr.c',
'vc5_bufmgr.h',
@@ -55,15 +55,15 @@ files_per_version = files(
v3dv3_c_args = []
dep_v3dv3 = dependency('v3dv3')
if dep_v3dv3.found()
- v3dv3_c_args = '-DUSE_VC5_SIMULATOR'
+ v3dv3_c_args = '-DUSE_V3D_SIMULATOR'
endif
-vc5_versions = ['33', '41']
+v3d_versions = ['33', '41']
per_version_libs = []
-foreach ver : vc5_versions
+foreach ver : v3d_versions
per_version_libs += static_library(
- 'vc5-v' + ver,
+ 'v3d-v' + ver,
[files_per_version, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
include_directories : [
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
@@ -76,9 +76,9 @@ foreach ver : vc5_versions
endforeach
-libvc5 = static_library(
- 'vc5',
- [files_libvc5, v3d_xml_pack],
+libv3d = static_library(
+ 'v3d',
+ [files_libv3d, v3d_xml_pack],
include_directories : [
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
inc_gallium_drivers, inc_drm_uapi,
@@ -89,8 +89,8 @@ libvc5 = static_library(
link_with: per_version_libs,
)
-driver_vc5 = declare_dependency(
- compile_args : '-DGALLIUM_VC5',
- link_with : [libvc5, libvc5winsys, libbroadcom_cle, libbroadcom_vc5],
+driver_v3d = declare_dependency(
+ compile_args : '-DGALLIUM_V3D',
+ link_with : [libv3d, libv3dwinsys, libbroadcom_cle, libbroadcom_v3d],
dependencies : idep_nir,
)
diff --git a/src/gallium/drivers/vc5/v3dx_simulator.c b/src/gallium/drivers/vc5/v3dx_simulator.c
index e1589d44b22..1162869be27 100644
--- a/src/gallium/drivers/vc5/v3dx_simulator.c
+++ b/src/gallium/drivers/vc5/v3dx_simulator.c
@@ -31,7 +31,7 @@
* we support.
*/
-#ifdef USE_VC5_SIMULATOR
+#ifdef USE_V3D_SIMULATOR
#include "vc5_screen.h"
#include "vc5_context.h"
@@ -187,4 +187,4 @@ v3dX(simulator_flush)(struct v3d_hw *v3d, struct drm_v3d_submit_cl *submit,
}
}
-#endif /* USE_VC5_SIMULATOR */
+#endif /* USE_V3D_SIMULATOR */
diff --git a/src/gallium/drivers/vc5/vc5_bufmgr.c b/src/gallium/drivers/vc5/vc5_bufmgr.c
index 28a7b008f9e..2773df3cf2f 100644
--- a/src/gallium/drivers/vc5/vc5_bufmgr.c
+++ b/src/gallium/drivers/vc5/vc5_bufmgr.c
@@ -348,7 +348,7 @@ vc5_bo_open_handle(struct vc5_screen *screen,
bo->name = "winsys";
bo->private = false;
-#ifdef USE_VC5_SIMULATOR
+#ifdef USE_V3D_SIMULATOR
vc5_simulator_open_from_handle(screen->fd, winsys_stride,
bo->handle, bo->size);
bo->map = malloc(bo->size);
diff --git a/src/gallium/drivers/vc5/vc5_context.h b/src/gallium/drivers/vc5/vc5_context.h
index ad52ea61290..5df02b3907d 100644
--- a/src/gallium/drivers/vc5/vc5_context.h
+++ b/src/gallium/drivers/vc5/vc5_context.h
@@ -47,7 +47,7 @@ void vc5_job_add_bo(struct vc5_job *job, struct vc5_bo *bo);
#include "vc5_resource.h"
#include "vc5_cl.h"
-#ifdef USE_VC5_SIMULATOR
+#ifdef USE_V3D_SIMULATOR
#define using_vc5_simulator true
#else
#define using_vc5_simulator false
diff --git a/src/gallium/drivers/vc5/vc5_job.c b/src/gallium/drivers/vc5/vc5_job.c
index 3da6ba82f47..7973b9e6829 100644
--- a/src/gallium/drivers/vc5/vc5_job.c
+++ b/src/gallium/drivers/vc5/vc5_job.c
@@ -410,7 +410,7 @@ vc5_job_submit(struct vc5_context *vc5, struct vc5_job *job)
if (!(V3D_DEBUG & V3D_DEBUG_NORAST)) {
int ret;
-#ifndef USE_VC5_SIMULATOR
+#ifndef USE_V3D_SIMULATOR
ret = drmIoctl(vc5->fd, DRM_IOCTL_V3D_SUBMIT_CL, &job->submit);
#else
ret = vc5_simulator_flush(vc5, &job->submit, job);
diff --git a/src/gallium/drivers/vc5/vc5_screen.c b/src/gallium/drivers/vc5/vc5_screen.c
index c36495f646b..9b367857322 100644
--- a/src/gallium/drivers/vc5/vc5_screen.c
+++ b/src/gallium/drivers/vc5/vc5_screen.c
@@ -598,7 +598,7 @@ vc5_screen_get_compiler_options(struct pipe_screen *pscreen,
}
struct pipe_screen *
-vc5_screen_create(int fd)
+v3d_screen_create(int fd)
{
struct vc5_screen *screen = rzalloc(NULL, struct vc5_screen);
struct pipe_screen *pscreen;
@@ -617,7 +617,7 @@ vc5_screen_create(int fd)
(void)mtx_init(&screen->bo_handles_mutex, mtx_plain);
screen->bo_handles = util_hash_table_create(handle_hash, handle_compare);
-#if defined(USE_VC5_SIMULATOR)
+#if defined(USE_V3D_SIMULATOR)
vc5_simulator_init(screen);
#endif
diff --git a/src/gallium/drivers/vc5/vc5_screen.h b/src/gallium/drivers/vc5/vc5_screen.h
index 9a7c11a63b8..975bfe01a75 100644
--- a/src/gallium/drivers/vc5/vc5_screen.h
+++ b/src/gallium/drivers/vc5/vc5_screen.h
@@ -93,7 +93,7 @@ vc5_screen(struct pipe_screen *screen)
return (struct vc5_screen *)screen;
}
-struct pipe_screen *vc5_screen_create(int fd);
+struct pipe_screen *v3d_screen_create(int fd);
void
vc5_fence_init(struct vc5_screen *screen);
diff --git a/src/gallium/drivers/vc5/vc5_simulator.c b/src/gallium/drivers/vc5/vc5_simulator.c
index 7c6f1ce0a4b..4a1650074c4 100644
--- a/src/gallium/drivers/vc5/vc5_simulator.c
+++ b/src/gallium/drivers/vc5/vc5_simulator.c
@@ -46,7 +46,7 @@
* BOs).
*/
-#ifdef USE_VC5_SIMULATOR
+#ifdef USE_V3D_SIMULATOR
#include <sys/mman.h>
#include "util/hash_table.h"
@@ -657,4 +657,4 @@ vc5_simulator_destroy(struct vc5_screen *screen)
mtx_unlock(&sim_state.mutex);
}
-#endif /* USE_VC5_SIMULATOR */
+#endif /* USE_V3D_SIMULATOR */
diff --git a/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp b/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp
index 5776aea20b4..bee3ce70bfd 100644
--- a/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp
+++ b/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp
@@ -27,7 +27,7 @@
* vc5_simulator.c code to use.
*/
-#ifdef USE_VC5_SIMULATOR
+#ifdef USE_V3D_SIMULATOR
#include "vc5_simulator_wrapper.h"
@@ -85,4 +85,4 @@ int v3d_hw_get_version(struct v3d_hw *hw)
}
-#endif /* USE_VC5_SIMULATOR */
+#endif /* USE_V3D_SIMULATOR */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 20:23:16 +0000