mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-16 16:37:08 +00:00
Split backend/common in backend/ and common/
This directory used to contain both the state tracking code for the backends, and the common utilities that could be used both by the backends and the rest of the code. Things are now: - src/common is utility code for the whole repo - src/backend contains libNXT's code - src/utils is utility code that we don't want in libNXT This commit also changes all includes to use global paths from src/ bacause it had to touch a bunch of #include statements anyway.
This commit is contained in:
committed by
Corentin Wallez
parent
a9b2a9871c
commit
fffe6dfa16
@@ -40,8 +40,7 @@ add_executable(nxt_unittests
|
||||
${VALIDATION_TESTS_DIR}/ValidationTest.h
|
||||
${TESTS_DIR}/UnittestsMain.cpp
|
||||
)
|
||||
target_link_libraries(nxt_unittests gtest nxt_backend mock_nxt nxt_wire utils)
|
||||
target_include_directories(nxt_unittests PRIVATE ${SRC_DIR})
|
||||
target_link_libraries(nxt_unittests nxt_common gtest nxt_backend mock_nxt nxt_wire utils)
|
||||
SetCXX14(nxt_unittests)
|
||||
|
||||
add_executable(nxt_end2end_tests
|
||||
@@ -51,6 +50,5 @@ add_executable(nxt_end2end_tests
|
||||
${TESTS_DIR}/NXTTest.cpp
|
||||
${TESTS_DIR}/NXTTest.h
|
||||
)
|
||||
target_link_libraries(nxt_end2end_tests gtest utils)
|
||||
target_include_directories(nxt_end2end_tests PRIVATE ${SRC_DIR})
|
||||
target_link_libraries(nxt_end2end_tests nxt_common gtest utils)
|
||||
SetCXX14(nxt_end2end_tests)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "NXTTest.h"
|
||||
#include "tests/NXTTest.h"
|
||||
|
||||
#include "utils/BackendBinding.h"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/BitSetIterator.h"
|
||||
#include "common/BitSetIterator.h"
|
||||
|
||||
// This is ANGLE's BitSetIterator_unittests.cpp file.
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/CommandAllocator.h"
|
||||
#include "backend/CommandAllocator.h"
|
||||
|
||||
using namespace backend;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/Math.h"
|
||||
#include "common/Math.h"
|
||||
|
||||
using namespace backend;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/PerStage.h"
|
||||
#include "backend/PerStage.h"
|
||||
|
||||
using namespace backend;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/RefCounted.h"
|
||||
#include "backend/RefCounted.h"
|
||||
|
||||
using namespace backend;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/SerialQueue.h"
|
||||
#include "common/SerialQueue.h"
|
||||
|
||||
using SerialQueue = backend::SerialQueue<int>;
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "backend/common/RefCounted.h"
|
||||
#include "backend/common/ToBackend.h"
|
||||
#include "backend/RefCounted.h"
|
||||
#include "backend/ToBackend.h"
|
||||
|
||||
#include <type_traits>
|
||||
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#include "wire/TerribleCommandBuffer.h"
|
||||
#include "wire/Wire.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
using namespace testing;
|
||||
using namespace nxt::wire;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
class CommandBufferValidationTest : public ValidationTest {
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
class ComputeValidationTest : public ValidationTest {
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
class CopyCommandTest : public ValidationTest {
|
||||
protected:
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
class DepthStencilStateValidationTest : public ValidationTest {
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
class FramebufferValidationTest : public ValidationTest {
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
#include "utils/NXTHelpers.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
class RenderPassValidationTest : public ValidationTest {
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ValidationTest.h"
|
||||
#include "tests/unittests/validation/ValidationTest.h"
|
||||
|
||||
#include "nxt/nxt.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user