Skip to content

Commit bdd1841

Browse files
martinkenmartinken
authored
Merge pull request #2130 from Kitware/webgpu_test_updates
fix(WebGPU): fix a texture issue on WebGPU
2 parents 0fb8f6b + 8a50448 commit bdd1841

27 files changed

+165
-165
lines changed

‎Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunction.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import { areEquals } from 'vtk.js/Sources/Common/Core/Math';
1414

1515
import baseline from './testColorTransferFunction.png';
1616

17-
test('Test Interpolate Scalars Before Colors', (t) => {
17+
test('Test Color Transfer Function', (t) => {
1818
const gc = testUtils.createGarbageCollector(t);
19-
t.ok('rendering', 'vtkOpenGLPolyDataMapper ColorTransferFunction');
19+
t.ok('rendering', 'vtkMapper ColorTransferFunction');
2020

2121
// Create some control UI
2222
const container = document.querySelector('body');

‎Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunctionInterpolation.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import colorMaps from '../ColorMaps.json';
1010
import createScalarMap from './createScalarMap';
1111
import baseline from './testColorTransferFunctionInterpolation.png';
1212

13-
test('Test Interpolate Scalars Before Colors', (t) => {
13+
test('Test ColorTransferFunction Interpolation', (t) => {
1414
const gc = testUtils.createGarbageCollector(t);
15-
t.ok('rendering', 'vtkOpenGLPolyDataMapper ColorTransferFunction Presets');
15+
t.ok('rendering', 'vtkMapper ColorTransferFunction Interpolaiton');
1616

1717
// testUtils.keepDOM();
1818

‎Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunctionPresets.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import baseline from './testColorTransferFunctionPresets.png';
1313
const MAX_NUMBER_OF_PRESETS = 200;
1414
const NUMBER_PER_LINE = 20;
1515

16-
test('Test Interpolate Scalars Before Colors', (t) => {
16+
test('Test ColorTransferFunction Presets', (t) => {
1717
const gc = testUtils.createGarbageCollector(t);
18-
t.ok('rendering', 'vtkOpenGLPolyDataMapper ColorTransferFunction Presets');
18+
t.ok('rendering', 'vtkMapper ColorTransferFunction Presets');
1919

2020
// Create some control UI
2121
const container = document.querySelector('body');

‎Sources/Rendering/OpenGL/PolyDataMapper/test/testInterpolateScalarsBeforeMapping.js‎ renamed to ‎Sources/Rendering/Core/Mapper/test/testInterpolateScalarsBeforeMapping.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import test from 'tape-catch';
22
import testUtils from 'vtk.js/Sources/Testing/testUtils';
33

4-
import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
4+
import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
55
import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
66
import vtkRenderer from 'vtk.js/Sources/Rendering/Core/Renderer';
77
import vtkLookupTable from 'vtk.js/Sources/Common/Core/LookupTable';
@@ -12,9 +12,9 @@ import vtkPolyData from 'vtk.js/Sources/Common/DataModel/PolyData';
1212

1313
import baseline from './testInterpolateScalarsBeforeMapping.png';
1414

15-
test.onlyIfWebGL('Test Interpolate Scalars Before Mapping', (t) => {
15+
test('Test Interpolate Scalars Before Mapping', (t) => {
1616
const gc = testUtils.createGarbageCollector(t);
17-
t.ok('rendering', 'vtkOpenGLPolyDataMapper InterpolateScalarsBeforeColors');
17+
t.ok('rendering', 'vtkMapper InterpolateScalarsBeforeColors');
1818

1919
// Create some control UI
2020
const container = document.querySelector('body');
@@ -97,8 +97,8 @@ test.onlyIfWebGL('Test Interpolate Scalars Before Mapping', (t) => {
9797
mapper.setInputData(pd);
9898
mapper.setInterpolateScalarsBeforeMapping(true);
9999

100-
// now create something to view it, in this case webgl
101-
const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
100+
// now create something to view it
101+
const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
102102
glwindow.setContainer(renderWindowContainer);
103103
renderWindow.addView(glwindow);
104104
glwindow.setSize(400, 400);
@@ -107,7 +107,7 @@ test.onlyIfWebGL('Test Interpolate Scalars Before Mapping', (t) => {
107107
testUtils.compareImages(
108108
image,
109109
[baseline],
110-
'Rendering/OpenGL/PolyDataMapper/testInterpolateScalarsBeforeMapping',
110+
'Rendering/Core/Mapper/testInterpolateScalarsBeforeMapping',
111111
t,
112112
1.5,
113113
gc.releaseResources

‎Sources/Rendering/OpenGL/PolyDataMapper/test/testInterpolateScalarsBeforeMapping.png‎ renamed to ‎Sources/Rendering/Core/Mapper/test/testInterpolateScalarsBeforeMapping.png‎

File renamed without changes.

‎Sources/Rendering/OpenGL/VolumeMapper/test/testAverageIntensityProjection.js‎ renamed to ‎Sources/Rendering/Core/VolumeMapper/test/testAverageIntensityProjection.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import testUtils from 'vtk.js/Sources/Testing/testUtils';
33

44
import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
55
import vtkHttpDataSetReader from 'vtk.js/Sources/IO/Core/HttpDataSetReader';
6-
import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
6+
import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
77
import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
88
import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
99
import vtkRenderWindowInteractor from 'vtk.js/Sources/Rendering/Core/RenderWindowInteractor';
@@ -14,9 +14,9 @@ import Constants from 'vtk.js/Sources/Rendering/Core/VolumeMapper/Constants';
1414

1515
import baseline from './testAverageIntensityProjection.png';
1616

17-
test.onlyIfWebGL('Test Average Intensity Projection Volume Rendering', (t) => {
17+
test('Test Average Intensity Projection Volume Rendering', (t) => {
1818
const gc = testUtils.createGarbageCollector(t);
19-
t.ok('rendering', 'vtkOpenGLVolumeMapper AverageIP');
19+
t.ok('rendering', 'vtkVolumeMapper AverageIP');
2020
// testUtils.keepDOM();
2121

2222
// Create some control UI
@@ -63,8 +63,8 @@ test.onlyIfWebGL('Test Average Intensity Projection Volume Rendering', (t) => {
6363

6464
mapper.setInputConnection(reader.getOutputPort());
6565

66-
// now create something to view it, in this case webgl
67-
const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
66+
// now create something to view it
67+
const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
6868
glwindow.setContainer(renderWindowContainer);
6969
renderWindow.addView(glwindow);
7070
glwindow.setSize(400, 400);
@@ -85,7 +85,7 @@ test.onlyIfWebGL('Test Average Intensity Projection Volume Rendering', (t) => {
8585
testUtils.compareImages(
8686
image,
8787
[baseline],
88-
'Rendering/OpenGL/VolumeMapper/testAverageIntensityProjection',
88+
'Rendering/Core/VolumeMapper/testAverageIntensityProjection',
8989
t,
9090
1.5,
9191
gc.releaseResources

‎Sources/Rendering/OpenGL/VolumeMapper/test/testAverageIntensityProjection.png‎ renamed to ‎Sources/Rendering/Core/VolumeMapper/test/testAverageIntensityProjection.png‎

File renamed without changes.

‎Sources/Rendering/OpenGL/VolumeMapper/test/testComposite.js‎ renamed to ‎Sources/Rendering/Core/VolumeMapper/test/testComposite.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import test from 'tape-catch';
22
import testUtils from 'vtk.js/Sources/Testing/testUtils';
33

4+
import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
45
import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
56
import vtkHttpDataSetReader from 'vtk.js/Sources/IO/Core/HttpDataSetReader';
6-
import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
77
import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
88
import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
99
import vtkRenderWindowInteractor from 'vtk.js/Sources/Rendering/Core/RenderWindowInteractor';
@@ -14,9 +14,9 @@ import vtkVolumeMapper from 'vtk.js/Sources/Rendering/Core/VolumeMapper';
1414
import baseline1 from './testComposite.png';
1515
import baseline2 from './testComposite_2.png';
1616

17-
test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
17+
test('Test Composite Volume Rendering', (t) => {
1818
const gc = testUtils.createGarbageCollector(t);
19-
t.ok('rendering', 'vtkOpenGLVolumeMapper Composite');
19+
t.ok('rendering', 'vtkVolumeMapper Composite');
2020
// testUtils.keepDOM();
2121

2222
// Create some control UI
@@ -55,8 +55,8 @@ test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
5555

5656
mapper.setInputConnection(reader.getOutputPort());
5757

58-
// now create something to view it, in this case webgl
59-
const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
58+
// now create something to view it
59+
const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
6060
glwindow.setContainer(renderWindowContainer);
6161
renderWindow.addView(glwindow);
6262
glwindow.setSize(400, 400);
@@ -80,7 +80,7 @@ test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
8080
testUtils.compareImages(
8181
image,
8282
[baseline1, baseline2],
83-
'Rendering/OpenGL/VolumeMapper/testComposite',
83+
'Rendering/Core/VolumeMapper/testComposite',
8484
t,
8585
1.5,
8686
gc.releaseResources

‎Sources/Rendering/OpenGL/VolumeMapper/test/testComposite.png‎ renamed to ‎Sources/Rendering/Core/VolumeMapper/test/testComposite.png‎

File renamed without changes.

‎Sources/Rendering/OpenGL/VolumeMapper/test/testComposite16Bit.js‎ renamed to ‎Sources/Rendering/Core/VolumeMapper/test/testComposite16Bit.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import test from 'tape-catch';
22
import testUtils from 'vtk.js/Sources/Testing/testUtils';
33

4+
import 'vtk.js/Sources/Rendering/Misc/RenderingAPIs';
45
import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
56
import vtkHttpDataSetReader from 'vtk.js/Sources/IO/Core/HttpDataSetReader';
6-
import vtkOpenGLRenderWindow from 'vtk.js/Sources/Rendering/OpenGL/RenderWindow';
77
import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
88
import vtkRenderWindow from 'vtk.js/Sources/Rendering/Core/RenderWindow';
99
import vtkRenderWindowInteractor from 'vtk.js/Sources/Rendering/Core/RenderWindowInteractor';
@@ -16,7 +16,7 @@ import baseline2 from './testComposite16Bit_2.png';
1616

1717
test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
1818
const gc = testUtils.createGarbageCollector(t);
19-
t.ok('rendering', 'vtkOpenGLVolumeMapper Composite16Bit');
19+
t.ok('rendering', 'vtkVolumeMapper Composite16Bit');
2020
// testUtils.keepDOM();
2121

2222
// Create some control UI
@@ -57,8 +57,8 @@ test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
5757
mapper.setImageSampleDistance(2.0);
5858
mapper.setInputConnection(reader.getOutputPort());
5959

60-
// now create something to view it, in this case webgl
61-
const glwindow = gc.registerResource(vtkOpenGLRenderWindow.newInstance());
60+
// now create something to view it
61+
const glwindow = gc.registerResource(renderWindow.newAPISpecificView());
6262
glwindow.setContainer(renderWindowContainer);
6363
renderWindow.addView(glwindow);
6464
glwindow.setSize(400, 400);
@@ -78,7 +78,7 @@ test.onlyIfWebGL('Test Composite Volume Rendering', (t) => {
7878
testUtils.compareImages(
7979
image,
8080
[baseline1, baseline2],
81-
'Rendering/OpenGL/VolumeMapper/testComposite16Bit',
81+
'Rendering/Core/VolumeMapper/testComposite16Bit',
8282
t,
8383
1.5,
8484
gc.releaseResources

0 commit comments

Comments
 (0)