andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Test

This commit is contained in:
Andrea Cavalli 2021-09-12 16:41:24 +02:00
parent f5a4fe32db
commit ea5e7c688e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glamor/glamor_render.c
View File

@ -560,8 +560,8 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
case PictFilterGood: case PictFilterGood:
case PictFilterBest: case PictFilterBest:
case PictFilterBilinear: case PictFilterBilinear:
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
break; break;
} }

12
glamor/glamor_xv.c
View File

@ -380,15 +380,15 @@ glamor_xv_render(glamor_port_private *port_priv, int id)
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->fbo->tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[1]->fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[1]->fbo->tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@ -397,8 +397,8 @@ glamor_xv_render(glamor_port_private *port_priv, int id)
case FOURCC_I420: case FOURCC_I420:
glActiveTexture(GL_TEXTURE2); glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
break; break;

2
hw/xwayland/xwayland-output.c
View File

@ -682,7 +682,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id)
RROutputSetConnection(xwl_output->randr_output, RR_Connected); RROutputSetConnection(xwl_output->randr_output, RR_Connected);
RRTellChanged(xwl_screen->screen); RRTellChanged(xwl_screen->screen);
xwl_output->scale = 2; xwl_output->scale = 1;
/* We want the output to be in the list as soon as created so we can /* We want the output to be in the list as soon as created so we can
* use it when binding to the xdg-output protocol... * use it when binding to the xdg-output protocol...

6
hw/xwayland/xwayland-screen.c
View File

@ -64,7 +64,7 @@
static DevPrivateKeyRec xwl_screen_private_key; static DevPrivateKeyRec xwl_screen_private_key;
static DevPrivateKeyRec xwl_client_private_key; static DevPrivateKeyRec xwl_client_private_key;
#define DEFAULT_DPI 192 #define DEFAULT_DPI 96
_X_NORETURN _X_NORETURN
static void _X_ATTRIBUTE_PRINTF(1, 2) static void _X_ATTRIBUTE_PRINTF(1, 2)
@ -160,7 +160,7 @@ xwl_screen_update_property(struct xwl_screen *screen,
xwl_screen_set_global_scale_from_property(screen, propstate->prop); xwl_screen_set_global_scale_from_property(screen, propstate->prop);
break; break;
case PropertyDelete: case PropertyDelete:
xwl_screen_set_global_scale(screen, 2); xwl_screen_set_global_scale(screen, 1);
break; break;
} }
} }
@ -646,7 +646,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
#ifdef XWL_HAS_GLAMOR #ifdef XWL_HAS_GLAMOR
xwl_screen->glamor = 1; xwl_screen->glamor = 1;
#endif #endif
xwl_screen->global_output_scale = 2; xwl_screen->global_output_scale = 1;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "-rootless") == 0) { if (strcmp(argv[i], "-rootless") == 0) {

4
hw/xwayland/xwayland-window.c
View File

@ -470,8 +470,8 @@ ensure_surface_for_window(WindowPtr window)
} }
wl_region_add(region, 0, 0, wl_region_add(region, 0, 0,
window->drawable.width, xwl_scale_to(xwl_screen, window->drawable.width),
window->drawable.height); xwl_scale_to(xwl_screen, window->drawable.height));
wl_surface_set_opaque_region(xwl_window->surface, region); wl_surface_set_opaque_region(xwl_window->surface, region);
wl_region_destroy(region); wl_region_destroy(region);
} }