Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set color blend equation state in shader object sample (validation fix) #918

Merged
merged 6 commits into from
Apr 8, 2024
Merged

Set color blend equation state in shader object sample (validation fix) #918

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7887bb8
Set color blend euqation
SaschaWillems Feb 17, 2024
ed0a8c4
Initialize values
SaschaWillems Feb 17, 2024
7a46a21
Merge branch 'main' into shader_object_val_fixes
SaschaWillems Mar 9, 2024
cd8a39b
Clang format fix
SaschaWillems Mar 9, 2024
6bf1624
Merge branch 'main' into shader_object_val_fixes
SaschaWillems Mar 11, 2024
cd249f6
Remove merge-conflict left-over
SaschaWillems Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions samples/extensions/shader_object/shader_object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
/*
<<<<<<< HEAD
* Copyright 2023-2024 Nintendo
* Copyright 2023-2024, Sascha Willems
=======
* Copyright 2023-2024-2024 Nintendo
* Copyright 2023-2024-2024, Sascha Willems
>>>>>>> main
SaschaWillems marked this conversation as resolved.
Show resolved Hide resolved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1431,6 +1436,10 @@ void ShaderObject::set_initial_state(VkCommandBuffer cmd)
// Rasterization is always enabled
vkCmdSetRasterizerDiscardEnableEXT(cmd, VK_FALSE);

// This also requires setting blend equations
VkColorBlendEquationEXT colorBlendEquationEXT{};
vkCmdSetColorBlendEquationEXT(cmd, 0, 1, &colorBlendEquationEXT);

{
// Setup vertex input with position, normals, and uv
const VkVertexInputBindingDescription2EXT vertex_binding[] =
Expand Down
8 changes: 4 additions & 4 deletions samples/extensions/shader_object/shader_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Nintendo
* Copyright 2023-2024 Nintendo
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -23,11 +23,11 @@ class ShaderObject : public ApiVulkanSample
public:
class Shader
{
VkShaderStageFlagBits stage;
VkShaderStageFlags next_stage;
VkShaderStageFlagBits stage{};
VkShaderStageFlags next_stage{};
VkShaderEXT shader = VK_NULL_HANDLE;
std::string shader_name = "shader";
VkShaderCreateInfoEXT vk_shader_create_info;
VkShaderCreateInfoEXT vk_shader_create_info{};
std::vector<uint32_t> spirv;

public:
Expand Down
Loading