AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: add storageSamples parameter to renderbuffer functions

Browse Source 
It's just passed to other functions but otherwise unused.
It will be used in following commits.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2018-06-11 15:26:41 -04:00
parent f7d42ee7d3
commit 2d115056d3
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/common/meta.c
+1 -1
View File
@@ -3079,7 +3079,7 @@ decompress_texture_image(struct gl_context *ctx,
/* alloc dest surface */
if (width > decompress_fbo->Width || height > decompress_fbo->Height) {
_mesa_renderbuffer_storage(ctx, decompress_fbo->rb, rbFormat,
width, height, 0);
width, height, 0, 0);
/* Do the full completeness check to recompute
* ctx->DrawBuffer->Width/Height.
src/mesa/main/fbobject.c
+25 -16
View File
@@ -2216,7 +2216,8 @@ invalidate_rb(GLuint key, void *data, void *userData)
void
_mesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei samples)
GLsizei height, GLsizei samples,
GLsizei storageSamples)
{
const GLenum baseFormat = _mesa_base_fbo_format(ctx, internalFormat);
@@ -2227,7 +2228,8 @@ _mesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
if (samples != 0) {
assert(samples > 0);
assert(_mesa_check_sample_count(ctx, GL_RENDERBUFFER,
internalFormat, samples) == GL_NO_ERROR);
internalFormat, samples,
storageSamples) == GL_NO_ERROR);
}
FLUSH_VERTICES(ctx, _NEW_BUFFERS);
@@ -2279,7 +2281,8 @@ _mesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
static void
renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei samples, const char *func)
GLsizei height, GLsizei samples, GLsizei storageSamples,
const char *func)
{
GLenum baseFormat;
GLenum sample_count_error;
@@ -2306,30 +2309,34 @@ renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
if (samples == NO_SAMPLES) {
/* NumSamples == 0 indicates non-multisampling */
samples = 0;
storageSamples = 0;
}
else {
/* check the sample count;
* note: driver may choose to use more samples than what's requested
*/
sample_count_error = _mesa_check_sample_count(ctx, GL_RENDERBUFFER,
internalFormat, samples);
internalFormat, samples, storageSamples);
/* Section 2.5 (GL Errors) of OpenGL 3.0 specification, page 16:
*
* "If a negative number is provided where an argument of type sizei or
* sizeiptr is specified, the error INVALID VALUE is generated."
*/
if (samples < 0) {
if (samples < 0 || storageSamples < 0) {
sample_count_error = GL_INVALID_VALUE;
}
if (sample_count_error != GL_NO_ERROR) {
_mesa_error(ctx, sample_count_error, "%s(samples=%d)", func, samples);
_mesa_error(ctx, sample_count_error,
"%s(samples=%d, storageSamples=%d)", func, samples,
storageSamples);
return;
}
}
_mesa_renderbuffer_storage(ctx, rb, internalFormat, width, height, samples);
_mesa_renderbuffer_storage(ctx, rb, internalFormat, width, height, samples,
storageSamples);
}
/**
@@ -2339,7 +2346,7 @@ renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
static void
renderbuffer_storage_named(GLuint renderbuffer, GLenum internalFormat,
GLsizei width, GLsizei height, GLsizei samples,
const char *func)
GLsizei storageSamples, const char *func)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2364,7 +2371,8 @@ renderbuffer_storage_named(GLuint renderbuffer, GLenum internalFormat,
return;
}
renderbuffer_storage(ctx, rb, internalFormat, width, height, samples, func);
renderbuffer_storage(ctx, rb, internalFormat, width, height, samples,
storageSamples, func);
}
/**
@@ -2375,7 +2383,7 @@ renderbuffer_storage_named(GLuint renderbuffer, GLenum internalFormat,
static void
renderbuffer_storage_target(GLenum target, GLenum internalFormat,
GLsizei width, GLsizei height, GLsizei samples,
const char *func)
GLsizei storageSamples, const char *func)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2406,7 +2414,7 @@ renderbuffer_storage_target(GLenum target, GLenum internalFormat,
}
renderbuffer_storage(ctx, ctx->CurrentRenderbuffer, internalFormat, width,
height, samples, func);
height, samples, storageSamples, func);
}
@@ -2469,7 +2477,7 @@ _mesa_RenderbufferStorage(GLenum target, GLenum internalFormat,
* a token value here just for error reporting purposes.
*/
renderbuffer_storage_target(target, internalFormat, width, height,
NO_SAMPLES, "glRenderbufferStorage");
NO_SAMPLES, 0, "glRenderbufferStorage");
}
@@ -2479,7 +2487,8 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
GLsizei width, GLsizei height)
{
renderbuffer_storage_target(target, internalFormat, width, height,
samples, "glRenderbufferStorageMultisample");
samples, samples,
"glRenderbufferStorageMultisample");
}
@@ -2500,7 +2509,7 @@ _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
break;
}
renderbuffer_storage_target(target, internalFormat, width, height, 0,
renderbuffer_storage_target(target, internalFormat, width, height, 0, 0,
"glRenderbufferStorageEXT");
}
@@ -2513,7 +2522,7 @@ _mesa_NamedRenderbufferStorage(GLuint renderbuffer, GLenum internalformat,
* a token value here just for error reporting purposes.
*/
renderbuffer_storage_named(renderbuffer, internalformat, width, height,
NO_SAMPLES, "glNamedRenderbufferStorage");
NO_SAMPLES, 0, "glNamedRenderbufferStorage");
}
void GLAPIENTRY
@@ -2522,7 +2531,7 @@ _mesa_NamedRenderbufferStorageMultisample(GLuint renderbuffer, GLsizei samples,
GLsizei width, GLsizei height)
{
renderbuffer_storage_named(renderbuffer, internalformat, width, height,
samples,
samples, samples,
"glNamedRenderbufferStorageMultisample");
}
src/mesa/main/fbobject.h
+2 -1
View File
@@ -95,7 +95,8 @@ _mesa_framebuffer_renderbuffer(struct gl_context *ctx,
extern void
_mesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei samples);
GLsizei height, GLsizei samples,
GLsizei storageSamples);
extern void
_mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb);
src/mesa/main/multisample.c
+2 -1
View File
@@ -209,7 +209,8 @@ _mesa_MinSampleShading(GLclampf value)
*/
GLenum
_mesa_check_sample_count(struct gl_context *ctx, GLenum target,
GLenum internalFormat, GLsizei samples)
GLenum internalFormat, GLsizei samples,
GLsizei storageSamples)
{
/* Section 4.4 (Framebuffer objects), page 198 of the OpenGL ES 3.0.0
* specification says:
src/mesa/main/multisample.h
+2 -1
View File
@@ -55,6 +55,7 @@ _mesa_MinSampleShading(GLclampf value);
extern GLenum
_mesa_check_sample_count(struct gl_context *ctx, GLenum target,
GLenum internalFormat, GLsizei samples);
GLenum internalFormat, GLsizei samples,
GLsizei storageSamples);
#endif
src/mesa/main/teximage.c
+1 -1
View File
@@ -5850,7 +5850,7 @@ texture_image_multisample(struct gl_context *ctx, GLuint dims,
}
sample_count_error = _mesa_check_sample_count(ctx, target,
internalformat, samples);
internalformat, samples, samples);
samplesOK = sample_count_error == GL_NO_ERROR;
/* Page 254 of OpenGL 4.4 spec says: