10905371537

Committed 17 Sep 2024 02:39PM UTC coverage: 91.791% (+0.001%) from 91.79%

Build # 10905371537

Build Type

Pull #9158

github

Committed by

web-flow

Commit Message

Merge a76974934 into 95ee077fa

Pull Request Pull Request #9158: Fix countItems in DataFilterExtension

Run Details

6737 of 7371 branches covered (91.4%)

Branch coverage included in aggregate %.

41 of 41 new or added lines in 2 files covered. (100.0%)

1 existing line in 1 file now uncovered.

54967 of 59851 relevant lines covered (91.84%)

14669.05 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

94.12

/modules/extensions/src/data-filter/aggregator.ts

import {Device, DeviceFeature, Framebuffer, RenderPipelineParameters} from '@luma.gl/core';
import {Model} from '@luma.gl/engine';

const AGGREGATE_VS = `\
#version 300 es
#define SHADER_NAME data-filter-vertex-shader

#ifdef FLOAT_TARGET
  in float filterIndices;
  in float filterPrevIndices;
#else
  in vec2 filterIndices;
  in vec2 filterPrevIndices;
#endif

out vec4 vColor;
const float component = 1.0 / 255.0;

void main() {
  #ifdef FLOAT_TARGET
    // BUG: always 0 for some reason
    // dataFilter_value *= float(filterIndices != filterPrevIndices);
    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
    vColor = vec4(0.0, 0.0, 0.0, 1.0);
  #else
    // Float texture is not supported: pack result into 4 channels x 256 px x 64px
    dataFilter_value *= float(filterIndices.x != filterPrevIndices.x);
    float col = filterIndices.x;
    float row = filterIndices.y * 4.0;
    float channel = floor(row);
    row = fract(row);
    vColor = component * vec4(bvec4(channel == 0.0, channel == 1.0, channel == 2.0, channel == 3.0));
    gl_Position = vec4(col * 2.0 - 1.0, row * 2.0 - 1.0, 0.0, 1.0);
  #endif
  gl_PointSize = 1.0;
}
`;

const AGGREGATE_FS = `\
#version 300 es
#define SHADER_NAME data-filter-fragment-shader
precision highp float;

in vec4 vColor;

out vec4 fragColor;

void main() {
  if (dataFilter_value < 0.5) {
    discard;
  }
  fragColor = vColor;
}
`;

const FLOAT_TARGET_FEATURES: DeviceFeature[] = [
  'float32-renderable-webgl', // ability to render to float texture
  'texture-blend-float-webgl' // ability to blend when rendering to float texture
];

export function supportsFloatTarget(device: Device): boolean {
  return FLOAT_TARGET_FEATURES.every(feature => device.features.has(feature));
}

// A 1x1 framebuffer object that encodes the total count of filtered items
export function getFramebuffer(device: Device, useFloatTarget: boolean): Framebuffer {
  if (useFloatTarget) {
    return device.createFramebuffer({
      width: 1,
      height: 1,
      colorAttachments: [
        device.createTexture({
          format: 'rgba32float',
          mipmaps: false
        })
      ]
    });
  }
  return device.createFramebuffer({
    width: 256,
    height: 64,
    colorAttachments: [device.createTexture({format: 'rgba8unorm', mipmaps: false})]
  });
}

// Increments the counter based on dataFilter_value
export function getModel(device: Device, shaderOptions: any, useFloatTarget: boolean): Model {
  shaderOptions.defines.NON_INSTANCED_MODEL = 1;
  if (useFloatTarget) {
    shaderOptions.defines.FLOAT_TARGET = 1;
  }

  return new Model(device, {
    id: 'data-filter-aggregation-model',
    vertexCount: 1,
    isInstanced: false,
    topology: 'point-list',
    vs: AGGREGATE_VS,
    fs: AGGREGATE_FS,
    ...shaderOptions
  });
}

export const parameters: RenderPipelineParameters = {
  blend: true,
  blendColorSrcFactor: 'one',
  blendColorDstFactor: 'one',
  blendAlphaSrcFactor: 'one',
  blendAlphaDstFactor: 'one',
  blendColorOperation: 'add',
  blendAlphaOperation: 'add',
  depthCompare: 'never'
} as const;

1	import {Device, DeviceFeature, Framebuffer, RenderPipelineParameters} from '@luma.gl/core';	1✔
2	import {Model} from '@luma.gl/engine';	1✔
3		1✔
4	const AGGREGATE_VS = `\	1✔
5	#version 300 es	1✔
6	#define SHADER_NAME data-filter-vertex-shader	1✔
7		1✔
8	#ifdef FLOAT_TARGET	1✔
9	in float filterIndices;	1✔
10	in float filterPrevIndices;	1✔
11	#else	1✔
12	in vec2 filterIndices;	1✔
13	in vec2 filterPrevIndices;	1✔
14	#endif	1✔
15		1✔
16	out vec4 vColor;	1✔
17	const float component = 1.0 / 255.0;	1✔
18		1✔
19	void main() {	1✔
20	#ifdef FLOAT_TARGET	1✔
21	// BUG: always 0 for some reason	1✔
22	// dataFilter_value *= float(filterIndices != filterPrevIndices);	1✔
23	gl_Position = vec4(0.0, 0.0, 0.0, 1.0);	1✔
24	vColor = vec4(0.0, 0.0, 0.0, 1.0);	1✔
25	#else	1✔
26	// Float texture is not supported: pack result into 4 channels x 256 px x 64px	1✔
27	dataFilter_value *= float(filterIndices.x != filterPrevIndices.x);	1✔
28	float col = filterIndices.x;	1✔
29	float row = filterIndices.y * 4.0;	1✔
30	float channel = floor(row);	1✔
31	row = fract(row);	1✔
32	vColor = component * vec4(bvec4(channel == 0.0, channel == 1.0, channel == 2.0, channel == 3.0));	1✔
33	gl_Position = vec4(col * 2.0 - 1.0, row * 2.0 - 1.0, 0.0, 1.0);	1✔
34	#endif	1✔
35	gl_PointSize = 1.0;	1✔
36	}	1✔
37	`;	1✔
38		1✔
39	const AGGREGATE_FS = `\	1✔
40	#version 300 es	1✔
41	#define SHADER_NAME data-filter-fragment-shader	1✔
42	precision highp float;	1✔
43		1✔
44	in vec4 vColor;	1✔
45		1✔
46	out vec4 fragColor;	1✔
47		1✔
48	void main() {	1✔
49	if (dataFilter_value < 0.5) {	1✔
50	discard;	1✔
51	}	1✔
52	fragColor = vColor;	1✔
53	}	1✔
54	`;	1✔
55		1✔
56	const FLOAT_TARGET_FEATURES: DeviceFeature[] = [	1✔
57	'float32-renderable-webgl', // ability to render to float texture	1✔
58	'texture-blend-float-webgl' // ability to blend when rendering to float texture	1✔
59	];	1✔
60		1✔
61	export function supportsFloatTarget(device: Device): boolean {	1✔
62	return FLOAT_TARGET_FEATURES.every(feature => device.features.has(feature));	1✔
63	}	1✔
64		1✔
65	// A 1x1 framebuffer object that encodes the total count of filtered items	1✔
66	export function getFramebuffer(device: Device, useFloatTarget: boolean): Framebuffer {	1✔
67	if (useFloatTarget) {	1✔
68	return device.createFramebuffer({	1✔
69	width: 1,	1✔
70	height: 1,	1✔
71	colorAttachments: [	1✔
72	device.createTexture({	1✔
73	format: 'rgba32float',	1✔
74	mipmaps: false	1✔
75	})	1✔
76	]	1✔
77	});	1✔
78	}	1!
79	return device.createFramebuffer({	×
80	width: 256,	×
81	height: 64,	×
82	colorAttachments: [device.createTexture({format: 'rgba8unorm', mipmaps: false})]	×
83	});	×
UNCOV 84	}	×
85		1✔
86	// Increments the counter based on dataFilter_value	1✔
87	export function getModel(device: Device, shaderOptions: any, useFloatTarget: boolean): Model {	1✔
88	shaderOptions.defines.NON_INSTANCED_MODEL = 1;	1✔
89	if (useFloatTarget) {	1✔
90	shaderOptions.defines.FLOAT_TARGET = 1;	1✔
91	}	1✔
92		1✔
93	return new Model(device, {	1✔
94	id: 'data-filter-aggregation-model',	1✔
95	vertexCount: 1,	1✔
96	isInstanced: false,	1✔
97	topology: 'point-list',	1✔
98	vs: AGGREGATE_VS,	1✔
99	fs: AGGREGATE_FS,	1✔
100	...shaderOptions	1✔
101	});	1✔
102	}	1✔
103		1✔
104	export const parameters: RenderPipelineParameters = {	1✔
105	blend: true,	1✔
106	blendColorSrcFactor: 'one',	1✔
107	blendColorDstFactor: 'one',	1✔
108	blendAlphaSrcFactor: 'one',	1✔
109	blendAlphaDstFactor: 'one',	1✔
110	blendColorOperation: 'add',	1✔
111	blendAlphaOperation: 'add',	1✔
112	depthCompare: 'never'	1✔
113	} as const;	1✔

visgl / deck.gl / 10905371537

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous