Skip to content

Commit ce2edf0

Browse files
Fixed a few more GL tests. (#1658)
Co-authored-by: Branimir Karadzic <branimirkaradzic@gmail.com>
1 parent 02add01 commit ce2edf0

2 files changed

Lines changed: 14 additions & 28 deletions

File tree

Apps/Playground/Scripts/config.json

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030
{
3131
"title": "NME Shadow Map",
3232
"playgroundId": "#M3QR7E#83",
33-
"excludedGraphicsApis": [ "OpenGL" ],
34-
"referenceImage": "nmeshadowmap.png",
35-
"comments": {
36-
"OpenGL": "xvfb : invalid enum with glRenderbufferStorage"
37-
}
33+
"referenceImage": "nmeshadowmap.png"
3834
},
3935
{
4036
"title": "Procedural texture with NME",
@@ -46,12 +42,8 @@
4642
"title": "GLTF Extension EXT_mesh_gpu_instancing",
4743
"playgroundId": "#QFIGLW#9",
4844
"renderCount": 10,
49-
"errorRatio": 6,
50-
"referenceImage": "gltfExtensionExtMeshGpuInstancingTest.png",
51-
"excludedGraphicsApis": [ "OpenGL" ],
52-
"comments": {
53-
"OpenGL": "Test works with OpenGL but it so slow that CI times out"
54-
}
45+
"errorRatio": 25,
46+
"referenceImage": "gltfExtensionExtMeshGpuInstancingTest.png"
5547
},
5648
{
5749
"title": "GLTF ext MSFT_LOD",
@@ -72,11 +64,10 @@
7264
"title": "GLTF Extension KHR_materials_volume with attenuation",
7365
"playgroundId": "#YG3BBF#18",
7466
"referenceImage": "gltfExtensionKhrMaterialsVolumeAttenuation.png",
75-
"excludedGraphicsApis": [ "OpenGL", "Metal" ],
76-
"errorRatio": 1.2,
67+
"excludedGraphicsApis": [ "Metal" ],
68+
"errorRatio": 10,
7769
"renderCount": 10,
7870
"comments": {
79-
"OpenGL": "xvfb : invalid enum with glRenderbufferStorage",
8071
"Metal": "No object rendered"
8172
}
8273
},
@@ -152,10 +143,9 @@
152143
"title": "Glow layer and LODs",
153144
"playgroundId": "#UNS6ZV#2",
154145
"renderCount": 50,
155-
"excludedGraphicsApis": [ "OpenGL", "D3D12", "Metal" ],
146+
"excludedGraphicsApis": [ "D3D12", "Metal" ],
156147
"referenceImage": "glowlayerandlods.png",
157148
"comments": {
158-
"OpenGL": "xvfb : invalid enum with glRenderbufferStorage",
159149
"D3D12": "Mapping a texture fails with error HRESULT 0x887A0005",
160150
"Metal": "Result doesn't match reference"
161151
}
@@ -255,10 +245,9 @@
255245
{
256246
"title": "Point light shadows",
257247
"playgroundId": "#U2F7P9#4",
258-
"excludedGraphicsApis": [ "OpenGL", "Metal" ],
248+
"excludedGraphicsApis": [ "Metal" ],
259249
"referenceImage": "point-light-shadows.png",
260250
"comments": {
261-
"OpenGL": "xvfb : invalid enum with glRenderbufferStorage",
262251
"Metal": "Rendered result doesn't match reference"
263252
}
264253
},
@@ -364,33 +353,30 @@
364353
"title": "Scissor test",
365354
"playgroundId": "#W7E7CF#34",
366355
"referenceImage": "scissor-test.png",
367-
"excludedGraphicsApis": [ "D3D12", "OpenGL" ],
356+
"excludedGraphicsApis": [ "D3D12" ],
368357
"comments": {
369-
"D3D12": "reenable when automatic mip-maps issue is fixed in bgfx",
370-
"OpenGL": "Incorrect rendering"
358+
"D3D12": "reenable when automatic mip-maps issue is fixed in bgfx"
371359
}
372360
},
373361
{
374362
"title": "Scissor test with 0.9 hardware scaling",
375363
"playgroundId": "#W7E7CF#34",
376364
"replace": "//options//, hardwareScalingLevel = 0.9;",
377365
"referenceImage": "scissor-test-2.png",
378-
"excludedGraphicsApis": [ "D3D12", "OpenGL" ],
366+
"excludedGraphicsApis": [ "D3D12" ],
379367
"errorRatio": 50,
380368
"comments": {
381-
"D3D12": "reenable when automatic mip-maps issue is fixed in bgfx",
382-
"OpenGL": "Incorrect rendering"
369+
"D3D12": "reenable when automatic mip-maps issue is fixed in bgfx"
383370
}
384371
},
385372
{
386373
"title": "Scissor test with 1.5 hardware scaling",
387374
"playgroundId": "#W7E7CF#34",
388375
"replace": "//options//, hardwareScalingLevel = 1.5;",
389376
"referenceImage": "scissor-test-3.png",
390-
"excludedGraphicsApis": [ "D3D12", "OpenGL" ],
377+
"excludedGraphicsApis": [ "D3D12" ],
391378
"comments": {
392-
"D3D12": "reenable when automatic mip-maps issue is fixed in bgfx",
393-
"OpenGL": "Incorrect rendering"
379+
"D3D12": "reenable when automatic mip-maps issue is fixed in bgfx"
394380
}
395381
},
396382
{

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FetchContent_Declare(base-n
3535
EXCLUDE_FROM_ALL)
3636
FetchContent_Declare(bgfx.cmake
3737
GIT_REPOSITORY https://github.com/BabylonJS/bgfx.cmake.git
38-
GIT_TAG 7499c2fe6b7f403381f397c04325450312f74c2e
38+
GIT_TAG 53d884a6e221f96fade72a15e0ad5f92ec7b66b5
3939
EXCLUDE_FROM_ALL)
4040
FetchContent_Declare(CMakeExtensions
4141
GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git

0 commit comments

Comments
 (0)