Replace flat 110 sampler type space with an orthogonalized 430 sampler type space. Invoke it for all the sampler types in the 4.3 grammar.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20652 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
e396a22632
commit
e141d5c99c
7 changed files with 311 additions and 196 deletions
|
|
@ -77,9 +77,37 @@ TString TType::getCompleteString() const
|
|||
else if (vectorSize > 1)
|
||||
p += snprintf(p, end - p, "%d-component vector of ", vectorSize);
|
||||
|
||||
snprintf(p, end - p, "%s", getBasicString());
|
||||
*p = 0;
|
||||
TString s(buf);
|
||||
|
||||
return TString(buf);
|
||||
if (type == EbtSampler) {
|
||||
switch (sampler.type) {
|
||||
case EbtFloat: break;
|
||||
case EbtInt: s.append("i"); break;
|
||||
case EbtUint: s.append("u"); break;
|
||||
}
|
||||
if (sampler.image)
|
||||
s.append("image");
|
||||
else
|
||||
s.append("sampler");
|
||||
switch (sampler.dim) {
|
||||
case Esd1D: s.append("1D"); break;
|
||||
case Esd2D: s.append("2D"); break;
|
||||
case Esd3D: s.append("3D"); break;
|
||||
case EsdCube: s.append("Cube"); break;
|
||||
case EsdRect: s.append("Rect"); break;
|
||||
case EsdBuffer: s.append("Buffer"); break;
|
||||
}
|
||||
if (sampler.arrayed)
|
||||
s.append("Array");
|
||||
if (sampler.shadow)
|
||||
s.append("Shadow");
|
||||
if (sampler.ms)
|
||||
s.append("MS");
|
||||
} else
|
||||
s.append(getBasicString());
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue