From 2520e9589f6682ebcd9b3a285b8f4411e681ebcf Mon Sep 17 00:00:00 2001 From: thejinchao Date: Sun, 29 Jun 2025 16:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=85=89=E6=A0=85=E5=8C=96?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/core/CMakeLists.txt | 17 +++++++++++++++-- .../dvc_rasterizer_triangle.h} | 0 source/core/source/pipe/dvc_render_step_PS.cpp | 2 +- .../dvc_rasterizer_triangle.cpp | 2 +- test/rasterization/dvr_triangle.cpp | 2 +- test/unit/dvt_unit_rasterizer.cpp | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) rename source/core/include/{pipe/dvc_rasterizer.h => rasterizer/dvc_rasterizer_triangle.h} (100%) rename source/core/source/{pipe => rasterizer}/dvc_rasterizer_triangle.cpp (99%) diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt index 4d0cbf3..d28d95d 100644 --- a/source/core/CMakeLists.txt +++ b/source/core/CMakeLists.txt @@ -112,7 +112,6 @@ set(DV_CORE_PIPE_INCLUDE_FILES include/pipe/dvc_render_step_IA.h include/pipe/dvc_render_step_VS.h include/pipe/dvc_render_step_PS.h - include/pipe/dvc_rasterizer.h ) source_group("include/pipe" FILES ${DV_CORE_PIPE_INCLUDE_FILES}) @@ -123,10 +122,22 @@ set(DV_CORE_PIPE_SOURCE_FILES source/pipe/dvc_render_step_IA.cpp source/pipe/dvc_render_step_VS.cpp source/pipe/dvc_render_step_PS.cpp - source/pipe/dvc_rasterizer_triangle.cpp ) source_group("source/pipe" FILES ${DV_CORE_PIPE_SOURCE_FILES}) +################# +# rasterizer +################# +set(DV_CORE_RASTERIZER_INCLUDE_FILES + include/rasterizer/dvc_rasterizer_triangle.h +) +source_group("include/rasterizer" FILES ${DV_CORE_RASTERIZER_INCLUDE_FILES}) + +set(DV_CORE_RASTERIZER_SOURCE_FILES + source/rasterizer/dvc_rasterizer_triangle.cpp +) +source_group("source/rasterizer" FILES ${DV_CORE_RASTERIZER_SOURCE_FILES}) + ################# # shader ################# @@ -162,6 +173,8 @@ add_library(dv_core SHARED ${DV_CORE_ASSET_SOURCE_FILES} ${DV_CORE_PIPE_INCLUDE_FILES} ${DV_CORE_PIPE_SOURCE_FILES} + ${DV_CORE_RASTERIZER_INCLUDE_FILES} + ${DV_CORE_RASTERIZER_SOURCE_FILES} ${DV_CORE_SHADER_INCLUDE_FILES} ${DV_CORE_SHADER_SOURCE_FILES} ) diff --git a/source/core/include/pipe/dvc_rasterizer.h b/source/core/include/rasterizer/dvc_rasterizer_triangle.h similarity index 100% rename from source/core/include/pipe/dvc_rasterizer.h rename to source/core/include/rasterizer/dvc_rasterizer_triangle.h diff --git a/source/core/source/pipe/dvc_render_step_PS.cpp b/source/core/source/pipe/dvc_render_step_PS.cpp index 4e7d3d9..f867b8a 100644 --- a/source/core/source/pipe/dvc_render_step_PS.cpp +++ b/source/core/source/pipe/dvc_render_step_PS.cpp @@ -1,7 +1,7 @@ #include "pipe/dvc_render_step_PS.h" #include "shader/dvc_shader_interface.h" #include "device/dvc_buffer.h" -#include "pipe/dvc_rasterizer.h" +#include "rasterizer/dvc_rasterizer_triangle.h" #include "math/dvc_math_util.h" DV_CORE_BEGIN_NAMESPACE diff --git a/source/core/source/pipe/dvc_rasterizer_triangle.cpp b/source/core/source/rasterizer/dvc_rasterizer_triangle.cpp similarity index 99% rename from source/core/source/pipe/dvc_rasterizer_triangle.cpp rename to source/core/source/rasterizer/dvc_rasterizer_triangle.cpp index 878ca0c..d96f3ed 100644 --- a/source/core/source/pipe/dvc_rasterizer_triangle.cpp +++ b/source/core/source/rasterizer/dvc_rasterizer_triangle.cpp @@ -1,4 +1,4 @@ -#include "pipe/dvc_rasterizer.h" +#include "rasterizer/dvc_rasterizer_triangle.h" #include "math/dvc_fix_point.h" #include "math/dvc_math_util.h" diff --git a/test/rasterization/dvr_triangle.cpp b/test/rasterization/dvr_triangle.cpp index e12cd97..cc7e0f2 100644 --- a/test/rasterization/dvr_triangle.cpp +++ b/test/rasterization/dvr_triangle.cpp @@ -1,5 +1,5 @@ #include "dvr_triangle.h" -#include "pipe/dvc_rasterizer.h" +#include "rasterizer/dvc_rasterizer_triangle.h" void Triangle::build(const davinci::fVector3& _pixelColor, int32_t canvasWidth, int32_t canvasHeight, bool debug) { diff --git a/test/unit/dvt_unit_rasterizer.cpp b/test/unit/dvt_unit_rasterizer.cpp index 9ca5fff..c30f5c9 100644 --- a/test/unit/dvt_unit_rasterizer.cpp +++ b/test/unit/dvt_unit_rasterizer.cpp @@ -1,4 +1,4 @@ -#include "pipe/dvc_rasterizer.h" +#include "rasterizer/dvc_rasterizer_triangle.h" #include "buffer/dvu_dump_buffer.h" #include