Skip to content
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.

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

Split YUV2RGB shader into GL/GLES #12794

Merged
merged 1 commit into from Sep 14, 2017
Merged

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented Sep 13, 2017

Tested on GL and GLES this works the same way as before.

This cleans up much of the ifdefs in the code.

Should be tested on windows as this affects it and I don't build for windows.

@lrusak lrusak added v18 Leia Type: Cleanup non-breaking change which removes non-working or unmaintained functionality labels Sep 13, 2017
Copy link
Member

@Rechi Rechi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a few missing overrides discovered by jenkins

void SetContrast(float contrast) override { m_contrast = contrast; }
void SetNonLinStretch(float stretch) override { m_stretch = stretch; }

virtual GLint GetVertexLoc() { return m_hVertex; }

This comment was marked as spam.

void SetNonLinStretch(float stretch) override { m_stretch = stretch; }

virtual GLint GetVertexLoc() { return m_hVertex; }
virtual GLint GetYcoordLoc() { return m_hYcoord; }

This comment was marked as spam.


virtual GLint GetVertexLoc() { return m_hVertex; }
virtual GLint GetYcoordLoc() { return m_hYcoord; }
virtual GLint GetUcoordLoc() { return m_hUcoord; }

This comment was marked as spam.

virtual GLint GetVertexLoc() { return m_hVertex; }
virtual GLint GetYcoordLoc() { return m_hYcoord; }
virtual GLint GetUcoordLoc() { return m_hUcoord; }
virtual GLint GetVcoordLoc() { return m_hVcoord; }

This comment was marked as spam.

virtual GLint GetUcoordLoc() { return m_hUcoord; }
virtual GLint GetVcoordLoc() { return m_hVcoord; }

virtual void SetMatrices(GLfloat *p, GLfloat *m) { m_proj = p; m_model = m; }

This comment was marked as spam.

virtual GLint GetVcoordLoc() { return m_hVcoord; }

virtual void SetMatrices(GLfloat *p, GLfloat *m) { m_proj = p; m_model = m; }
virtual void SetAlpha(GLfloat alpha) { m_alpha = alpha; }

This comment was marked as spam.

@lrusak
Copy link
Contributor Author

lrusak commented Sep 14, 2017

jenkins build and merge

@lrusak lrusak merged commit 1cfbb02 into xbmc:master Sep 14, 2017
@Rechi Rechi added this to the L 18.0-alpha1 milestone Sep 14, 2017
@lrusak lrusak deleted the split-yuv2rgb-shader branch September 15, 2017 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants