Skip to content

Track number of samples for textures and renderbuffers #1182

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

Merged
dsrbecky merged 1 commit into from
Oct 10, 2017
Merged

Track number of samples for textures and renderbuffers #1182

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions gapis/api/gles/api/framebuffer.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ class Renderbuffer {
GLsizei Width = 0
GLsizei Height = 0
GLenum InternalFormat = GL_RGBA4
GLsizei Samples = 0
/* TODO
GLuint RedSize = 0
GLuint GreenSize = 0
GLuint BlueSize = 0
GLuint AlphaSize = 0
GLuint DepthSize = 0
GLuint StencilSize = 0
GLuint Samples = 0
*/

@unused string Label
Expand Down Expand Up @@ -1095,8 +1095,7 @@ sub void RenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum i
rb.InternalFormat = internalformat
rb.Width = width
rb.Height = height

_ = samples // TODO
rb.Samples = samples
}

@if(Version.GLES10)
Expand Down
40 changes: 21 additions & 19 deletions gapis/api/gles/api/textures_and_samplers.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class Level {
class Image {
GLsizei Width
GLsizei Height
GLsizei Samples
GLboolean FixedSampleLocations
// GPU format of the texture including bit-sizes of the channels.
// This is unrelated to the format of the data passed to the API.
@unused GLenum SizedFormat
Expand Down Expand Up @@ -290,6 +292,8 @@ sub void TexImage(TexImageFlags flags,
GLsizei height,
GLsizei depth,
GLint border,
GLsizei samples,
GLboolean fixedsamplelocations,
// Format&data
GLenum sized_format,
GLenum data_format,
Expand Down Expand Up @@ -406,6 +410,8 @@ sub void TexImage(TexImageFlags flags,
tmpLevel.Layers[zoffset + z + cubemap_layer] = new!Image(
Width: max!GLsizei(1, width >> as!u32(l)),
Height: max!GLsizei(1, height >> as!u32(l)),
Samples: samples,
FixedSampleLocations: fixedsamplelocations,
SizedFormat: sfBox.SizedFormat,
DataFormat: data_format,
DataType: data_type)
Expand Down Expand Up @@ -657,7 +663,7 @@ cmd void glCompressedTexImage2D(GLenum target,
TexturePointer data) {
TexImage(IsCompressedTexImageCmd, target,
level, 0, 0, 0, // Offsets
1, width, height, 1, border, // Dimensions
1, width, height, 1, border, 0, GL_TRUE, // Dimensions
internalformat, internalformat, GL_NONE, image_size, data) // Format&data
}

Expand All @@ -680,7 +686,7 @@ cmd void glCompressedTexImage3D(GLenum target,
sub void CompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei image_size, TexturePointer data) {
TexImage(IsCompressedTexImageCmd | Has3DModifier, target,
level, 0, 0, 0, // Offsets
1, width, height, depth, border, // Dimensions
1, width, height, depth, border, 0, GL_TRUE, // Dimensions
internalformat, internalformat, GL_NONE, image_size, data) // Format&data
}

Expand All @@ -700,7 +706,7 @@ cmd void glCompressedTexSubImage2D(GLenum target,
TexturePointer data) {
TexImage(IsCompressedTexImageCmd | HasSubModifier, target,
level, xoffset, yoffset, 0, // Offsets
1, width, height, 1, 0, // Dimensions
1, width, height, 1, 0, 0, GL_TRUE, // Dimensions
internalformat, internalformat, GL_NONE, image_size, data) // Format&data
}

Expand All @@ -725,7 +731,7 @@ cmd void glCompressedTexSubImage3D(GLenum target,
sub void CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum internalformat, GLsizei image_size, TexturePointer data) {
TexImage(IsCompressedTexImageCmd | HasSubModifier | Has3DModifier, target,
level, xoffset, yoffset, zoffset, // Offsets
1, width, height, depth, 0, // Dimensions
1, width, height, depth, 0, 0, GL_TRUE, // Dimensions
internalformat, internalformat, GL_NONE, image_size, data) // Format&data
}

Expand Down Expand Up @@ -801,7 +807,7 @@ cmd void glCopyTexImage2D(GLenum target,
GLint border) {
TexImage(IsCopyTexImageCmd, target,
level, 0, 0, 0, // Offsets
1, width, height, 1, border, // Dimensions
1, width, height, 1, border, 0, GL_TRUE, // Dimensions
internalformat, GL_NONE, GL_NONE, 0, null) // Format&data
}

Expand All @@ -820,7 +826,7 @@ cmd void glCopyTexSubImage2D(GLenum target,
GLsizei height) {
TexImage(IsCopyTexImageCmd | HasSubModifier, target,
level, xoffset, yoffset, 0, // Offsets
1, width, height, 1, 0, // Dimensions
1, width, height, 1, 0, 0, GL_TRUE, // Dimensions
GL_NONE, GL_NONE, GL_NONE, 0, null) // Format&data
}

Expand All @@ -843,7 +849,7 @@ cmd void glCopyTexSubImage3D(GLenum target,
sub void CopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) {
TexImage(IsCopyTexImageCmd | HasSubModifier | Has3DModifier, target,
level, xoffset, yoffset, zoffset, // Offsets
1, width, height, 1, 0, // Dimensions
1, width, height, 1, 0, 0, GL_TRUE, // Dimensions
GL_NONE, GL_NONE, GL_NONE, 0, null) // Format&data
_ = x // TODO
_ = y // TODO
Expand Down Expand Up @@ -1487,7 +1493,7 @@ cmd void glTexImage2D(GLenum target,
TexturePointer data) {
TexImage(IsTexImageCmd, target,
level, 0, 0, 0, // Offsets
1, width, height, 1, border, // Dimensions
1, width, height, 1, border, 0, GL_TRUE, // Dimensions
as!GLenum(internalformat), format, type, 0, data) // Format&data
}

Expand All @@ -1511,7 +1517,7 @@ cmd void glTexImage3D(GLenum target,
sub void TexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, TexturePointer data) {
TexImage(IsTexImageCmd | Has3DModifier, target,
level, 0, 0, 0, // Offsets
1, width, height, depth, border, // Dimensions
1, width, height, depth, border, 0, GL_TRUE, // Dimensions
as!GLenum(internalformat), format, type, 0, data) // Format&data
}

Expand Down Expand Up @@ -1732,7 +1738,7 @@ sub void TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsi
}
TexImage(IsTexStorageCmd, target,
0, 0, 0, 0, // Offsets
levels, width, height, depth, 0, // Dimensions
levels, width, height, depth, 0, 0, GL_TRUE, // Dimensions
internalformat, GL_NONE, GL_NONE, 0, null) // Format&data
}

Expand All @@ -1747,10 +1753,8 @@ cmd void glTexStorage2DMultisample(GLenum target,
GLboolean fixedsamplelocations) {
TexImage(IsTexStorageCmd | HasMultisampleModifier, target,
0, 0, 0, 0, // Offsets
1, width, height, 1, 0, // Dimensions
1, width, height, 1, 0, samples, fixedsamplelocations, // Dimensions
internalformat, GL_NONE, GL_NONE, 0, null) // Format&data
_ = samples // TODO
_ = fixedsamplelocations // TODO
}

@if(Version.GLES30)
Expand All @@ -1769,7 +1773,7 @@ cmd void glTexStorage3D(GLenum target,
sub void TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) {
TexImage(IsTexStorageCmd | Has3DModifier, target,
0, 0, 0, 0, // Offsets
levels, width, height, depth, 0, // Dimensions
levels, width, height, depth, 0, 0, GL_TRUE, // Dimensions
internalformat, GL_NONE, GL_NONE, 0, null) // Format&data
}

Expand All @@ -1788,10 +1792,8 @@ cmd void glTexStorage3DMultisample(GLenum target,
sub void TexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations) {
TexImage(IsTexStorageCmd | Has3DModifier | HasMultisampleModifier, target,
0, 0, 0, 0, // Offsets
1, width, height, depth, 0, // Dimensions
1, width, height, depth, 0, samples, fixedsamplelocations, // Dimensions
internalformat, GL_NONE, GL_NONE, 0, null) // Format&data
_ = samples // TODO
_ = fixedsamplelocations // TODO
}

@if(Version.GLES10)
Expand All @@ -1810,7 +1812,7 @@ cmd void glTexSubImage2D(GLenum target,
TexturePointer data) {
TexImage(IsTexImageCmd | HasSubModifier, target,
level, xoffset, yoffset, 0, // Offsets
1, width, height, 1, 0, // Dimensions
1, width, height, 1, 0, 0, GL_TRUE, // Dimensions
GL_NONE, format, type, 0, data) // Format&data
}

Expand All @@ -1835,6 +1837,6 @@ cmd void glTexSubImage3D(GLenum target,
sub void TexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, TexturePointer data) {
TexImage(IsTexImageCmd | HasSubModifier | Has3DModifier, target,
level, xoffset, yoffset, zoffset, // Offsets
1, width, height, depth, 0, // Dimensions
1, width, height, depth, 0, 0, GL_TRUE, // Dimensions
GL_NONE, format, type, 0, data) // Format&data
}