mirror of
https://github.com/mpv-player/mpv
synced 2025-03-21 02:41:13 +00:00
vo_gl: Make it possible to select GL_NEAREST scaling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31743 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
93336619b2
commit
ccb01cc877
@ -526,12 +526,19 @@ static void autodetectGlExtensions(void) {
|
|||||||
ati_hack, force_pbo, use_rectangle, use_yuv);
|
ati_hack, force_pbo, use_rectangle, use_yuv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static GLint get_scale_type(int chroma) {
|
||||||
|
int nearest = (chroma ? cscale : lscale) & 64;
|
||||||
|
if (nearest)
|
||||||
|
return mipmap_gen ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST;
|
||||||
|
return mipmap_gen ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Initialize a (new or reused) OpenGL context.
|
* \brief Initialize a (new or reused) OpenGL context.
|
||||||
* set global gl-related variables to their default values
|
* set global gl-related variables to their default values
|
||||||
*/
|
*/
|
||||||
static int initGl(uint32_t d_width, uint32_t d_height) {
|
static int initGl(uint32_t d_width, uint32_t d_height) {
|
||||||
int scale_type = mipmap_gen ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR;
|
GLint scale_type = get_scale_type(0);
|
||||||
autodetectGlExtensions();
|
autodetectGlExtensions();
|
||||||
gl_target = use_rectangle == 1 ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D;
|
gl_target = use_rectangle == 1 ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D;
|
||||||
yuvconvtype = SET_YUV_CONVERSION(use_yuv) |
|
yuvconvtype = SET_YUV_CONVERSION(use_yuv) |
|
||||||
@ -559,6 +566,7 @@ static int initGl(uint32_t d_width, uint32_t d_height) {
|
|||||||
if (is_yuv) {
|
if (is_yuv) {
|
||||||
int i;
|
int i;
|
||||||
int xs, ys;
|
int xs, ys;
|
||||||
|
scale_type = get_scale_type(1);
|
||||||
mp_get_chroma_shift(image_format, &xs, &ys);
|
mp_get_chroma_shift(image_format, &xs, &ys);
|
||||||
mpglGenTextures(21, default_texs);
|
mpglGenTextures(21, default_texs);
|
||||||
default_texs[21] = 0;
|
default_texs[21] = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user