Revert "cmake: Add hardware renderer source"

This reverts commit 97971ee.

Author: allkern

CMakeLists.txt

@@ -5,9 +5,9 @@ cmake_minimum_required(VERSION 3.16...4.0)
 set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 
 set(WIN_ICON ${CMAKE_CURRENT_SOURCE_DIR}/res/iris.rc)
-set(OSX_ICON ${CMAKE_CURRENT_SOURCE_DIR}/res/iris.icns)
 set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
+set(OSX_ICON ${CMAKE_CURRENT_SOURCE_DIR}/res/iris.icns)
 set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64")
@@ -122,7 +122,6 @@ target_sources(iris PRIVATE
   src/gs/renderer/renderer.cpp
   src/gs/renderer/software.cpp
   src/gs/renderer/software_thread.cpp
-  src/gs/renderer/hardware.cpp
   src/iop/bus.c
   src/iop/cdvd.c
   src/iop/disc.c
@@ -213,8 +212,8 @@ message(STATUS "CMake System Name: ${CMAKE_SYSTEM_NAME}")
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
     # tell Install about the target, otherwise fixup won't know about the transitive dependencies
     install(TARGETS iris
-        BUNDLE DESTINATION ./install COMPONENT Runtime
-   	    RUNTIME DESTINATION ./install/bin COMPONENT Runtime
+    	BUNDLE DESTINATION ./install COMPONENT Runtime
+   	  RUNTIME DESTINATION ./install/bin COMPONENT Runtime
     )
 
     set(DEP_DIR "${CMAKE_BINARY_DIR}")  # where to look for dependencies when fixing up

src/gs/renderer/software_thread.cpp

@@ -422,8 +422,7 @@ void software_thread_destroy(void* udata) {
     // release buffers
     SDL_ReleaseGPUBuffer(ctx->device, ctx->vertex_buffer);
     SDL_ReleaseGPUBuffer(ctx->device, ctx->index_buffer);
-    SDL_ReleaseGPUSampler(ctx->device, ctx->sampler[0]);
-    SDL_ReleaseGPUSampler(ctx->device, ctx->sampler[1]);
+    SDL_ReleaseGPUSampler(ctx->device, ctx->sampler);
 
     if (ctx->texture) SDL_ReleaseGPUTexture(ctx->device, ctx->texture);
 
@@ -1529,26 +1528,16 @@ void software_thread_init(void* udata, struct ps2_gs* gs, SDL_Window* window, SD
 
     ctx->index_buffer = SDL_CreateGPUBuffer(device, &ibci);
 
-    SDL_GPUSamplerCreateInfo nearest_sci = {
-		.min_filter = SDL_GPU_FILTER_NEAREST,
-		.mag_filter = SDL_GPU_FILTER_NEAREST,
+    SDL_GPUSamplerCreateInfo sci = {
+		.min_filter = ctx->bilinear ? SDL_GPU_FILTER_LINEAR : SDL_GPU_FILTER_NEAREST,
+		.mag_filter = ctx->bilinear ? SDL_GPU_FILTER_LINEAR : SDL_GPU_FILTER_NEAREST,
 		.mipmap_mode = SDL_GPU_SAMPLERMIPMAPMODE_NEAREST,
 		.address_mode_u = SDL_GPU_SAMPLERADDRESSMODE_CLAMP_TO_EDGE,
 		.address_mode_v = SDL_GPU_SAMPLERADDRESSMODE_CLAMP_TO_EDGE,
 		.address_mode_w = SDL_GPU_SAMPLERADDRESSMODE_CLAMP_TO_EDGE,
     };
 
-    SDL_GPUSamplerCreateInfo linear_sci = {
-		.min_filter = SDL_GPU_FILTER_LINEAR,
-		.mag_filter = SDL_GPU_FILTER_LINEAR,
-		.mipmap_mode = SDL_GPU_SAMPLERMIPMAPMODE_NEAREST,
-		.address_mode_u = SDL_GPU_SAMPLERADDRESSMODE_CLAMP_TO_EDGE,
-		.address_mode_v = SDL_GPU_SAMPLERADDRESSMODE_CLAMP_TO_EDGE,
-		.address_mode_w = SDL_GPU_SAMPLERADDRESSMODE_CLAMP_TO_EDGE,
-    };
-
-    ctx->sampler[0] = SDL_CreateGPUSampler(ctx->device, &nearest_sci);
-    ctx->sampler[1] = SDL_CreateGPUSampler(ctx->device, &linear_sci);
+    ctx->sampler = SDL_CreateGPUSampler(ctx->device, &sci);
 }
 
 static inline void software_thread_vram_blit(struct ps2_gs* gs, software_thread_state* ctx) {
@@ -2833,7 +2822,7 @@ void software_thread_render(void* udata, SDL_GPUCommandBuffer* command_buffer, S
 
     SDL_GPUTextureSamplerBinding tsb = {
         .texture = ctx->texture,
-        .sampler = ctx->bilinear ? ctx->sampler[1] : ctx->sampler[0],
+        .sampler = ctx->sampler,
     };
 
     SDL_BindGPUFragmentSamplers(render_pass, 0, &tsb, 1);

src/gs/renderer/software_thread.hpp

@@ -49,7 +49,7 @@ struct software_thread_state {
     SDL_GPUBuffer* vertex_buffer = nullptr;
     SDL_GPUBuffer* index_buffer = nullptr;
     SDL_GPUTexture* texture = nullptr;
-    SDL_GPUSampler* sampler[2] = { nullptr };
+    SDL_GPUSampler* sampler = nullptr;
     SDL_GPUGraphicsPipeline* pipeline = nullptr;
 
     // Context