Remove texture_external overload for textureSample

Removes the unneeded texture_external overload of textureSample from
intrinsics.def.

Bug: tint:858
Change-Id: I49935bae47542af7b440c74c96418e005daf9e19
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/53940
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Ben Clayton <bclayton@google.com>
This commit is contained in:
Brandon Jones 2021-07-08 20:58:18 +00:00 committed by Tint LUCI CQ
parent 54cfa0b9a1
commit 79fae01483
7 changed files with 2230 additions and 2378 deletions

File diff suppressed because it is too large Load Diff

View File

@ -442,7 +442,6 @@ fn textureNumSamples<T: fiu32>(texture: texture_multisampled_2d<T>) -> i32
[[stage("fragment")]] fn textureSample(texture: texture_depth_2d_array, sampler: sampler, coords: vec2<f32>, array_index: i32, offset: vec2<i32>) -> f32
[[stage("fragment")]] fn textureSample(texture: texture_depth_cube, sampler: sampler, coords: vec3<f32>) -> f32
[[stage("fragment")]] fn textureSample(texture: texture_depth_cube_array, sampler: sampler, coords: vec3<f32>, array_index: i32) -> f32
[[stage("fragment")]] fn textureSample(texture: texture_external, sampler: sampler, coords: vec2<f32>) -> vec4<f32>
[[stage("fragment")]] fn textureSampleBias(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, bias: f32) -> vec4<f32>
[[stage("fragment")]] fn textureSampleBias(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, bias: f32, offset: vec2<i32>) -> vec4<f32>
[[stage("fragment")]] fn textureSampleBias(texture: texture_2d_array<f32>, sampler: sampler, coords: vec2<f32>, array_index: i32, bias: f32) -> vec4<f32>

View File

@ -1,36 +0,0 @@
// Copyright 2021 The Tint Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
////////////////////////////////////////////////////////////////////////////////
// File generated by tools/intrinsic-gen
// using the template:
// test/intrinsics/intrinsics.wgsl.tmpl
// and the intrinsic defintion file:
// src/intrinsics.def
//
// Do not modify this file directly
////////////////////////////////////////////////////////////////////////////////
[[group(1), binding(0)]] var arg_0: texture_external;
[[group(1), binding(1)]] var arg_1: sampler;
// fn textureSample(texture: texture_external, sampler: sampler, coords: vec2<f32>) -> vec4<f32>
fn textureSample_bb81ce() {
var res: vec4<f32> = textureSample(arg_0, arg_1, vec2<f32>());
}
[[stage(fragment)]]
fn fragment_main() {
textureSample_bb81ce();
}

View File

@ -1,11 +0,0 @@
Texture2D<float4> arg_0 : register(t0, space1);
SamplerState arg_1 : register(s1, space1);
void textureSample_bb81ce() {
float4 res = arg_0.Sample(arg_1, float2(0.0f, 0.0f));
}
void fragment_main() {
textureSample_bb81ce();
return;
}

View File

@ -1,12 +0,0 @@
#include <metal_stdlib>
using namespace metal;
void textureSample_bb81ce(texture2d<float, access::sample> tint_symbol, sampler tint_symbol_1) {
float4 res = tint_symbol.sample(tint_symbol_1, float2());
}
fragment void fragment_main(texture2d<float, access::sample> tint_symbol_2 [[texture(0)]], sampler tint_symbol_3 [[sampler(1)]]) {
textureSample_bb81ce(tint_symbol_2, tint_symbol_3);
return;
}

View File

@ -1,48 +0,0 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 26
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %fragment_main "fragment_main"
OpExecutionMode %fragment_main OriginUpperLeft
OpName %arg_0 "arg_0"
OpName %arg_1 "arg_1"
OpName %textureSample_bb81ce "textureSample_bb81ce"
OpName %res "res"
OpName %fragment_main "fragment_main"
OpDecorate %arg_0 DescriptorSet 1
OpDecorate %arg_0 Binding 0
OpDecorate %arg_1 DescriptorSet 1
OpDecorate %arg_1 Binding 1
%float = OpTypeFloat 32
%3 = OpTypeImage %float 2D 0 0 0 1 Unknown
%_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
%arg_0 = OpVariable %_ptr_UniformConstant_3 UniformConstant
%7 = OpTypeSampler
%_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
%arg_1 = OpVariable %_ptr_UniformConstant_7 UniformConstant
%void = OpTypeVoid
%8 = OpTypeFunction %void
%v4float = OpTypeVector %float 4
%16 = OpTypeSampledImage %3
%v2float = OpTypeVector %float 2
%19 = OpConstantNull %v2float
%_ptr_Function_v4float = OpTypePointer Function %v4float
%22 = OpConstantNull %v4float
%textureSample_bb81ce = OpFunction %void None %8
%11 = OpLabel
%res = OpVariable %_ptr_Function_v4float Function %22
%14 = OpLoad %7 %arg_1
%15 = OpLoad %3 %arg_0
%17 = OpSampledImage %16 %15 %14
%12 = OpImageSampleImplicitLod %v4float %17 %19
OpStore %res %12
OpReturn
OpFunctionEnd
%fragment_main = OpFunction %void None %8
%24 = OpLabel
%25 = OpFunctionCall %void %textureSample_bb81ce
OpReturn
OpFunctionEnd

View File

@ -1,12 +0,0 @@
[[group(1), binding(0)]] var arg_0 : external_texture;
[[group(1), binding(1)]] var arg_1 : sampler;
fn textureSample_bb81ce() {
var res : vec4<f32> = textureSample(arg_0, arg_1, vec2<f32>());
}
[[stage(fragment)]]
fn fragment_main() {
textureSample_bb81ce();
}