Skip to content

Fix missing-template-arg-list-after-template-kw #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −21
Open

Fix missing-template-arg-list-after-template-kw #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions gli/core/reduce.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ namespace detail

sampler1d<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0), SamplerB.template fetch(TexelIndex, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0), SamplerB.template fetch<>(TexelIndex, 0)));

for(size_type LevelIndex = 0, LevelCount = A.levels(); LevelIndex < LevelCount; ++LevelIndex)
{
extent_type const TexelCount(A.extent(LevelIndex));
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, LevelIndex)));
}
}

Expand All @@ -64,7 +64,7 @@ namespace detail

sampler1d_array<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0, 0), SamplerB.template fetch(TexelIndex, 0, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0, 0), SamplerB.template fetch<>(TexelIndex, 0, 0)));

for(size_type LayerIndex = 0, LayerCount = A.layers(); LayerIndex < LayerCount; ++LayerIndex)
for(size_type LevelIndex = 0, LevelCount = A.levels(); LevelIndex < LevelCount; ++LevelIndex)
Expand All @@ -73,8 +73,8 @@ namespace detail
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, LayerIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, LayerIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, LayerIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, LayerIndex, LevelIndex)));
}
}

Expand All @@ -95,7 +95,7 @@ namespace detail

sampler2d<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0), SamplerB.template fetch(TexelIndex, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0), SamplerB.template fetch<>(TexelIndex, 0)));

for(size_type LevelIndex = 0, LevelCount = A.levels(); LevelIndex < LevelCount; ++LevelIndex)
{
Expand All @@ -104,8 +104,8 @@ namespace detail
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, LevelIndex)));
}
}

Expand All @@ -126,7 +126,7 @@ namespace detail

sampler2d_array<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0, 0), SamplerB.template fetch(TexelIndex, 0, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0, 0), SamplerB.template fetch<>(TexelIndex, 0, 0)));

for(size_type LayerIndex = 0, LayerCount = A.layers(); LayerIndex < LayerCount; ++LayerIndex)
for(size_type LevelIndex = 0, LevelCount = A.levels(); LevelIndex < LevelCount; ++LevelIndex)
Expand All @@ -136,8 +136,8 @@ namespace detail
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, LayerIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, LayerIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, LayerIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, LayerIndex, LevelIndex)));
}
}

Expand All @@ -158,7 +158,7 @@ namespace detail

sampler3d<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0), SamplerB.template fetch(TexelIndex, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0), SamplerB.template fetch<>(TexelIndex, 0)));

for(size_type LevelIndex = 0, LevelCount = A.levels(); LevelIndex < LevelCount; ++LevelIndex)
{
Expand All @@ -168,8 +168,8 @@ namespace detail
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, LevelIndex)));
}
}

Expand All @@ -190,7 +190,7 @@ namespace detail

sampler_cube<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0, 0), SamplerB.template fetch(TexelIndex, 0, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0, 0), SamplerB.template fetch<>(TexelIndex, 0, 0)));

for(size_type FaceIndex = 0, FaceCount = A.faces(); FaceIndex < FaceCount; ++FaceIndex)
for(size_type LevelIndex = 0, LevelCount = A.levels(); LevelIndex < LevelCount; ++LevelIndex)
Expand All @@ -200,8 +200,8 @@ namespace detail
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, FaceIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, FaceIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, FaceIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, FaceIndex, LevelIndex)));
}
}

Expand All @@ -222,7 +222,7 @@ namespace detail

sampler_cube_array<val_type> const SamplerA(A, gli::WRAP_CLAMP_TO_EDGE), SamplerB(B, gli::WRAP_CLAMP_TO_EDGE);
extent_type TexelIndex(0);
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch(TexelIndex, 0, 0, 0), SamplerB.template fetch(TexelIndex, 0, 0, 0)));
vec<4, val_type> Result(TexelFunc(SamplerA.template fetch<>(TexelIndex, 0, 0, 0), SamplerB.template fetch<>(TexelIndex, 0, 0, 0)));

for(size_type LayerIndex = 0, LayerCount = A.layers(); LayerIndex < LayerCount; ++LayerIndex)
for(size_type FaceIndex = 0, FaceCount = A.faces(); FaceIndex < FaceCount; ++FaceIndex)
Expand All @@ -233,8 +233,8 @@ namespace detail
for(TexelIndex.x = 0; TexelIndex.x < TexelCount.x; ++TexelIndex.x)
{
Result = ReduceFunc(Result, TexelFunc(
SamplerA.template fetch(TexelIndex, LayerIndex, FaceIndex, LevelIndex),
SamplerB.template fetch(TexelIndex, LayerIndex, FaceIndex, LevelIndex)));
SamplerA.template fetch<>(TexelIndex, LayerIndex, FaceIndex, LevelIndex),
SamplerB.template fetch<>(TexelIndex, LayerIndex, FaceIndex, LevelIndex)));
}
}

Expand Down