fixed requesting 4 samples instead of r_msaa samples

This commit is contained in:
myT 2018-10-05 14:03:02 +02:00
parent 1370e44ae5
commit a49512abde
2 changed files with 4 additions and 2 deletions

View file

@ -14,6 +14,8 @@ add: /toggle can now accept a value sequence (2 or more entries) to loop through
if the cvar's current value is in the sequence and not in the last spot, the next one is used
otherwise, the first value in the sequence is used
fix: when r_msaa was in the range [2, 16], the requested sample count was always 4
fix: /video and /stopvideo fixes
chg: /video can only be used during demo playback
fix: broken audio in the output files

View file

@ -505,12 +505,12 @@ static qbool GL2_FBO_CreateMS( FrameBuffer& fb )
GL(qglGenRenderbuffers( 1, &fb.color ));
GL(qglBindRenderbuffer( GL_RENDERBUFFER, fb.color ));
GL(qglRenderbufferStorageMultisample( GL_RENDERBUFFER, 4, GL_RGBA8, glConfig.vidWidth, glConfig.vidHeight ));
GL(qglRenderbufferStorageMultisample( GL_RENDERBUFFER, r_msaa->integer, GL_RGBA8, glConfig.vidWidth, glConfig.vidHeight ));
GL(qglFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, fb.color ));
GL(qglGenRenderbuffers( 1, &fb.depthStencil ));
GL(qglBindRenderbuffer( GL_RENDERBUFFER, fb.depthStencil ));
GL(qglRenderbufferStorageMultisample( GL_RENDERBUFFER, 4, GL_DEPTH24_STENCIL8, glConfig.vidWidth, glConfig.vidHeight ));
GL(qglRenderbufferStorageMultisample( GL_RENDERBUFFER, r_msaa->integer, GL_DEPTH24_STENCIL8, glConfig.vidWidth, glConfig.vidHeight ));
GL(qglFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, fb.color ));
GL(qglFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb.depthStencil ));