-
Notifications
You must be signed in to change notification settings - Fork 2
/
29_multisampling.diff
317 lines (299 loc) · 10.7 KB
/
29_multisampling.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
diff --git a/../steps/28_mipmapping/main.go b/../steps/29_multisampling/main.go
index 0e76d03..1389f9e 100644
--- a/../steps/28_mipmapping/main.go
+++ b/../steps/29_multisampling/main.go
@@ -21,6 +21,7 @@ import (
"image/png"
"log"
"math"
+ "runtime"
"unsafe"
)
@@ -154,6 +155,11 @@ type HelloTriangleApplication struct {
depthImage core1_0.Image
depthImageMemory core1_0.DeviceMemory
depthImageView core1_0.ImageView
+
+ msaaSamples core1_0.SampleCountFlags
+ colorImage core1_0.Image
+ colorImageMemory core1_0.DeviceMemory
+ colorImageView core1_0.ImageView
}
func (app *HelloTriangleApplication) Run() error {
@@ -246,6 +252,11 @@ func (app *HelloTriangleApplication) initVulkan() error {
return err
}
+ err = app.createColorResources()
+ if err != nil {
+ return err
+ }
+
err = app.createDepthResources()
if err != nil {
return err
@@ -347,6 +358,21 @@ appLoop:
}
func (app *HelloTriangleApplication) cleanupSwapChain() {
+ if app.colorImageView != nil {
+ app.colorImageView.Destroy(nil)
+ app.colorImageView = nil
+ }
+
+ if app.colorImage != nil {
+ app.colorImage.Destroy(nil)
+ app.colorImage = nil
+ }
+
+ if app.colorImageMemory != nil {
+ app.colorImageMemory.Free(nil)
+ app.colorImageMemory = nil
+ }
+
if app.depthImageView != nil {
app.depthImageView.Destroy(nil)
app.depthImageView = nil
@@ -485,6 +511,8 @@ func (app *HelloTriangleApplication) cleanup() {
app.window.Destroy()
}
sdl.Quit()
+
+ app.loader.Driver().ObjectStore().PrintDebug()
}
func (app *HelloTriangleApplication) recreateSwapChain() error {
@@ -523,6 +551,11 @@ func (app *HelloTriangleApplication) recreateSwapChain() error {
return err
}
+ err = app.createColorResources()
+ if err != nil {
+ return err
+ }
+
err = app.createDepthResources()
if err != nil {
return err
@@ -666,6 +699,10 @@ func (app *HelloTriangleApplication) pickPhysicalDevice() error {
for _, device := range physicalDevices {
if app.isDeviceSuitable(device) {
app.physicalDevice = device
+ app.msaaSamples, err = app.getMaxUsableSampleCount()
+ if err != nil {
+ return err
+ }
break
}
}
@@ -816,17 +853,17 @@ func (app *HelloTriangleApplication) createRenderPass() error {
Attachments: []core1_0.AttachmentDescription{
{
Format: app.swapchainImageFormat,
- Samples: core1_0.Samples1,
+ Samples: app.msaaSamples,
LoadOp: core1_0.AttachmentLoadOpClear,
StoreOp: core1_0.AttachmentStoreOpStore,
StencilLoadOp: core1_0.AttachmentLoadOpDontCare,
StencilStoreOp: core1_0.AttachmentStoreOpDontCare,
InitialLayout: core1_0.ImageLayoutUndefined,
- FinalLayout: khr_swapchain.ImageLayoutPresentSrc,
+ FinalLayout: core1_0.ImageLayoutColorAttachmentOptimal,
},
{
Format: depthFormat,
- Samples: core1_0.Samples1,
+ Samples: app.msaaSamples,
LoadOp: core1_0.AttachmentLoadOpClear,
StoreOp: core1_0.AttachmentStoreOpDontCare,
StencilLoadOp: core1_0.AttachmentLoadOpDontCare,
@@ -834,6 +871,16 @@ func (app *HelloTriangleApplication) createRenderPass() error {
InitialLayout: core1_0.ImageLayoutUndefined,
FinalLayout: core1_0.ImageLayoutDepthStencilAttachmentOptimal,
},
+ {
+ Format: app.swapchainImageFormat,
+ Samples: core1_0.Samples1,
+ LoadOp: core1_0.AttachmentLoadOpDontCare,
+ StoreOp: core1_0.AttachmentStoreOpStore,
+ StencilLoadOp: core1_0.AttachmentLoadOpDontCare,
+ StencilStoreOp: core1_0.AttachmentStoreOpDontCare,
+ InitialLayout: core1_0.ImageLayoutUndefined,
+ FinalLayout: khr_swapchain.ImageLayoutPresentSrc,
+ },
},
Subpasses: []core1_0.SubpassDescription{
{
@@ -844,6 +891,12 @@ func (app *HelloTriangleApplication) createRenderPass() error {
Layout: core1_0.ImageLayoutColorAttachmentOptimal,
},
},
+ ResolveAttachments: []core1_0.AttachmentReference{
+ {
+ Attachment: 2,
+ Layout: core1_0.ImageLayoutColorAttachmentOptimal,
+ },
+ },
DepthStencilAttachment: &core1_0.AttachmentReference{
Attachment: 1,
Layout: core1_0.ImageLayoutDepthStencilAttachmentOptimal,
@@ -998,7 +1051,7 @@ func (app *HelloTriangleApplication) createGraphicsPipeline() error {
multisample := &core1_0.PipelineMultisampleStateCreateInfo{
SampleShadingEnable: false,
- RasterizationSamples: core1_0.Samples1,
+ RasterizationSamples: app.msaaSamples,
MinSampleShading: 1.0,
}
@@ -1060,8 +1113,9 @@ func (app *HelloTriangleApplication) createFramebuffers() error {
RenderPass: app.renderPass,
Layers: 1,
Attachments: []core1_0.ImageView{
- imageView,
+ app.colorImageView,
app.depthImageView,
+ imageView,
},
Width: app.swapchainExtent.Width,
Height: app.swapchainExtent.Height,
@@ -1094,6 +1148,29 @@ func (app *HelloTriangleApplication) createCommandPool() error {
return nil
}
+func (app *HelloTriangleApplication) createColorResources() error {
+ var err error
+ app.colorImage, app.colorImageMemory, err = app.createImage(
+ app.swapchainExtent.Width,
+ app.swapchainExtent.Height,
+ 1,
+ app.msaaSamples,
+ app.swapchainImageFormat,
+ core1_0.ImageTilingOptimal,
+ core1_0.ImageUsageTransientAttachment|core1_0.ImageUsageColorAttachment,
+ core1_0.MemoryPropertyDeviceLocal)
+ if err != nil {
+ return err
+ }
+
+ app.colorImageView, err = app.createImageView(
+ app.colorImage,
+ app.swapchainImageFormat,
+ core1_0.ImageAspectColor,
+ 1)
+ return err
+}
+
func (app *HelloTriangleApplication) createDepthResources() error {
depthFormat, err := app.findDepthFormat()
if err != nil {
@@ -1103,6 +1180,7 @@ func (app *HelloTriangleApplication) createDepthResources() error {
app.depthImage, app.depthImageMemory, err = app.createImage(app.swapchainExtent.Width,
app.swapchainExtent.Height,
1,
+ app.msaaSamples,
depthFormat,
core1_0.ImageTilingOptimal,
core1_0.ImageUsageDepthStencilAttachment,
@@ -1160,6 +1238,9 @@ func (app *HelloTriangleApplication) createTextureImage() error {
return err
}
+ defer stagingBuffer.Destroy(nil)
+ defer stagingMemory.Free(nil)
+
var pixelData []byte
for y := imageBounds.Min.Y; y < imageBounds.Max.Y; y++ {
@@ -1175,7 +1256,14 @@ func (app *HelloTriangleApplication) createTextureImage() error {
}
//Create final image
- app.textureImage, app.textureImageMemory, err = app.createImage(imageDims.X, imageDims.Y, app.mipLevels, core1_0.FormatR8G8B8A8SRGB, core1_0.ImageTilingOptimal, core1_0.ImageUsageTransferSrc|core1_0.ImageUsageTransferDst|core1_0.ImageUsageSampled, core1_0.MemoryPropertyDeviceLocal)
+ app.textureImage, app.textureImageMemory, err = app.createImage(imageDims.X,
+ imageDims.Y,
+ app.mipLevels,
+ core1_0.Samples1,
+ core1_0.FormatR8G8B8A8SRGB,
+ core1_0.ImageTilingOptimal,
+ core1_0.ImageUsageTransferSrc|core1_0.ImageUsageTransferDst|core1_0.ImageUsageSampled,
+ core1_0.MemoryPropertyDeviceLocal)
if err != nil {
return err
}
@@ -1190,15 +1278,7 @@ func (app *HelloTriangleApplication) createTextureImage() error {
return err
}
- err = app.generateMipmaps(app.textureImage, core1_0.FormatR8G8B8A8SRGB, imageDims.X, imageDims.Y, app.mipLevels)
- if err != nil {
- return err
- }
-
- stagingBuffer.Destroy(nil)
- stagingMemory.Free(nil)
-
- return nil
+ return app.generateMipmaps(app.textureImage, core1_0.FormatR8G8B8A8SRGB, imageDims.X, imageDims.Y, app.mipLevels)
}
func (app *HelloTriangleApplication) generateMipmaps(image core1_0.Image, imageFormat core1_0.Format, width, height int, mipLevels int) error {
@@ -1282,6 +1362,8 @@ func (app *HelloTriangleApplication) generateMipmaps(image core1_0.Image, imageF
barrier.NewLayout = core1_0.ImageLayoutShaderReadOnlyOptimal
barrier.SrcAccessMask = core1_0.AccessTransferRead
barrier.DstAccessMask = core1_0.AccessShaderRead
+ barrier.SrcQueueFamilyIndex = -1
+ barrier.DstQueueFamilyIndex = -1
err = commandBuffer.CmdPipelineBarrier(core1_0.PipelineStageTransfer, core1_0.PipelineStageFragmentShader, 0, nil, nil, []core1_0.ImageMemoryBarrier{barrier})
if err != nil {
return err
@@ -1309,6 +1391,35 @@ func (app *HelloTriangleApplication) generateMipmaps(image core1_0.Image, imageF
return app.endSingleTimeCommands(commandBuffer)
}
+func (app *HelloTriangleApplication) getMaxUsableSampleCount() (core1_0.SampleCountFlags, error) {
+ properties, err := app.physicalDevice.Properties()
+ if err != nil {
+ return 0, err
+ }
+
+ counts := properties.Limits.FramebufferColorSampleCounts & properties.Limits.FramebufferDepthSampleCounts
+
+ if (counts & core1_0.Samples64) != 0 {
+ return core1_0.Samples64, nil
+ }
+ if (counts & core1_0.Samples32) != 0 {
+ return core1_0.Samples32, nil
+ }
+ if (counts & core1_0.Samples16) != 0 {
+ return core1_0.Samples16, nil
+ }
+ if (counts & core1_0.Samples8) != 0 {
+ return core1_0.Samples8, nil
+ }
+ if (counts & core1_0.Samples4) != 0 {
+ return core1_0.Samples4, nil
+ }
+ if (counts & core1_0.Samples2) != 0 {
+ return core1_0.Samples2, nil
+ }
+ return core1_0.Samples1, nil
+}
+
func (app *HelloTriangleApplication) createTextureImageView() error {
var err error
app.textureImageView, err = app.createImageView(app.textureImage, core1_0.FormatR8G8B8A8SRGB, core1_0.ImageAspectColor, app.mipLevels)
@@ -1357,7 +1468,7 @@ func (app *HelloTriangleApplication) createImageView(image core1_0.Image, format
return imageView, err
}
-func (app *HelloTriangleApplication) createImage(width, height int, mipLevels int, format core1_0.Format, tiling core1_0.ImageTiling, usage core1_0.ImageUsageFlags, memoryProperties core1_0.MemoryPropertyFlags) (core1_0.Image, core1_0.DeviceMemory, error) {
+func (app *HelloTriangleApplication) createImage(width, height int, mipLevels int, numSamples core1_0.SampleCountFlags, format core1_0.Format, tiling core1_0.ImageTiling, usage core1_0.ImageUsageFlags, memoryProperties core1_0.MemoryPropertyFlags) (core1_0.Image, core1_0.DeviceMemory, error) {
image, _, err := app.device.CreateImage(nil, core1_0.ImageCreateInfo{
ImageType: core1_0.ImageType2D,
Extent: core1_0.Extent3D{
@@ -1372,7 +1483,7 @@ func (app *HelloTriangleApplication) createImage(width, height int, mipLevels in
InitialLayout: core1_0.ImageLayoutUndefined,
Usage: usage,
SharingMode: core1_0.SharingModeExclusive,
- Samples: core1_0.Samples1,
+ Samples: numSamples,
})
if err != nil {
return nil, nil, err
@@ -2109,7 +2220,10 @@ func (app *HelloTriangleApplication) logDebug(msgType ext_debug_utils.DebugUtils
}
func main() {
- app := &HelloTriangleApplication{}
+ runtime.LockOSThread()
+ app := &HelloTriangleApplication{
+ msaaSamples: core1_0.Samples1,
+ }
err := app.Run()
if err != nil {