[D3D11] Fix compute textures

Kode · Jan 17, 2024 · 1bce5ad · 1bce5ad
1 parent 5009b0f
commit 1bce5ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/Backends/Graphics4/Direct3D11/Sources/kinc/backend/graphics4/compute.c.h b/Backends/Graphics4/Direct3D11/Sources/kinc/backend/graphics4/compute.c.h
@@ -187,7 +187,7 @@ kinc_g4_texture_unit_t kinc_g4_compute_shader_get_texture_unit(kinc_g4_compute_s
 }
 #endif
 
-void kinc_g4_compute_set_shader(kinc_g4_compute_shader *shader) {
+void kinc_g4_set_compute_shader(kinc_g4_compute_shader *shader) {
 	dx_ctx.context->lpVtbl->CSSetShader(dx_ctx.context, (ID3D11ComputeShader *)shader->impl.shader, NULL, 0);
 #ifndef KINC_KONG
 	dx_ctx.context->lpVtbl->UpdateSubresource(dx_ctx.context, (ID3D11Resource *)shader->impl.constantBuffer, 0, NULL, computeConstants, 0, 0);

diff --git a/Backends/Graphics4/Direct3D11/Sources/kinc/backend/graphics4/texture.c.h b/Backends/Graphics4/Direct3D11/Sources/kinc/backend/graphics4/texture.c.h
@@ -228,10 +228,7 @@ void kinc_internal_texture_set(kinc_g4_texture_t *texture, kinc_g4_texture_unit_
 	}
 
 	if (unit.stages[KINC_G4_SHADER_TYPE_COMPUTE] >= 0) {
-		ID3D11ShaderResourceView *nullView = NULL;
-		dx_ctx.context->lpVtbl->PSSetShaderResources(dx_ctx.context, 0, 1, &nullView);
-
-		dx_ctx.context->lpVtbl->CSSetUnorderedAccessViews(dx_ctx.context, unit.stages[KINC_G4_SHADER_TYPE_COMPUTE], 1, &texture->impl.computeView, NULL);
+		dx_ctx.context->lpVtbl->PSSetShaderResources(dx_ctx.context, unit.stages[KINC_G4_SHADER_TYPE_COMPUTE], 1, &texture->impl.view);
 	}
 
 	if (unit.stages[KINC_G4_SHADER_TYPE_FRAGMENT] >= 0 || unit.stages[KINC_G4_SHADER_TYPE_VERTEX] >= 0) {
@@ -243,7 +240,7 @@ void kinc_internal_texture_set(kinc_g4_texture_t *texture, kinc_g4_texture_unit_
 #endif
 
 void kinc_internal_texture_set_image(kinc_g4_texture_t *texture, kinc_g4_texture_unit_t unit) {
-	if (unit.stages[KINC_G4_SHADER_TYPE_FRAGMENT] < 0)
+	if (unit.stages[KINC_G4_SHADER_TYPE_FRAGMENT] < 0 && unit.stages[KINC_G4_SHADER_TYPE_VERTEX] < 0 && unit.stages[KINC_G4_SHADER_TYPE_COMPUTE] < 0)
 		return;
 
 	if (texture->impl.computeView == NULL) {
@@ -256,8 +253,25 @@ void kinc_internal_texture_set_image(kinc_g4_texture_t *texture, kinc_g4_texture
 		kinc_microsoft_affirm(
 		    dx_ctx.device->lpVtbl->CreateUnorderedAccessView(dx_ctx.device, (ID3D11Resource *)texture->impl.texture3D, &du, &texture->impl.computeView));
 	}
-	dx_ctx.context->lpVtbl->OMSetRenderTargetsAndUnorderedAccessViews(dx_ctx.context, 0, NULL, NULL, unit.stages[KINC_G4_SHADER_TYPE_FRAGMENT], 1,
-	                                                                  &texture->impl.computeView, NULL);
+
+	if (unit.stages[KINC_G4_SHADER_TYPE_FRAGMENT] >= 0) {
+		ID3D11ShaderResourceView *nullView = NULL;
+		dx_ctx.context->lpVtbl->PSSetShaderResources(dx_ctx.context, 0, 1, &nullView);
+
+		dx_ctx.context->lpVtbl->CSSetUnorderedAccessViews(dx_ctx.context, unit.stages[KINC_G4_SHADER_TYPE_FRAGMENT], 1, &texture->impl.computeView, NULL);
+	}
+	if (unit.stages[KINC_G4_SHADER_TYPE_VERTEX] >= 0) {
+		ID3D11ShaderResourceView *nullView = NULL;
+		dx_ctx.context->lpVtbl->PSSetShaderResources(dx_ctx.context, 0, 1, &nullView);
+
+		dx_ctx.context->lpVtbl->CSSetUnorderedAccessViews(dx_ctx.context, unit.stages[KINC_G4_SHADER_TYPE_VERTEX], 1, &texture->impl.computeView, NULL);
+	}
+	if (unit.stages[KINC_G4_SHADER_TYPE_COMPUTE] >= 0) {
+		ID3D11ShaderResourceView *nullView = NULL;
+		dx_ctx.context->lpVtbl->PSSetShaderResources(dx_ctx.context, 0, 1, &nullView);
+
+		dx_ctx.context->lpVtbl->CSSetUnorderedAccessViews(dx_ctx.context, unit.stages[KINC_G4_SHADER_TYPE_COMPUTE], 1, &texture->impl.computeView, NULL);
+	}
 }
 
 void kinc_internal_texture_unset(kinc_g4_texture_t *texture) {