Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
obs-studio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yunxiang Li
obs-studio
Commits
f5fc9e7d
Commit
f5fc9e7d
authored
11 years ago
by
Jim
Browse files
Options
Downloads
Patches
Plain Diff
Remove redundant constant from conversion shader
parent
2dbbffe4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/data/libobs/format_conversion.effect
+1
-2
1 addition, 2 deletions
build/data/libobs/format_conversion.effect
libobs/obs-video.c
+0
-1
0 additions, 1 deletion
libobs/obs-video.c
with
1 addition
and
3 deletions
build/data/libobs/format_conversion.effect
+
1
−
2
View file @
f5fc9e7d
...
@@ -30,7 +30,6 @@ uniform float width_d2;
...
@@ -30,7 +30,6 @@ uniform float width_d2;
uniform float height_d2;
uniform float height_d2;
uniform float width_d2_i;
uniform float width_d2_i;
uniform float height_d2_i;
uniform float height_d2_i;
uniform float input_width;
uniform float input_height;
uniform float input_height;
uniform texture2d image;
uniform texture2d image;
...
@@ -62,7 +61,7 @@ float4 PSPlanar420(VertInOut vert_in) : TARGET
...
@@ -62,7 +61,7 @@ float4 PSPlanar420(VertInOut vert_in) : TARGET
float v_mul = floor(vert_in.uv.y * input_height);
float v_mul = floor(vert_in.uv.y * input_height);
#endif
#endif
float byte_offset = floor((v_mul + vert_in.uv.x) *
input_
width) * 4.0;
float byte_offset = floor((v_mul + vert_in.uv.x) * width) * 4.0;
float2 sample_pos[4];
float2 sample_pos[4];
...
...
This diff is collapsed.
Click to expand it.
libobs/obs-video.c
+
0
−
1
View file @
f5fc9e7d
...
@@ -171,7 +171,6 @@ static void render_convert_texture(struct obs_core_video *video,
...
@@ -171,7 +171,6 @@ static void render_convert_texture(struct obs_core_video *video,
set_eparam
(
effect
,
"height_d2"
,
fheight
*
0
.
5
f
);
set_eparam
(
effect
,
"height_d2"
,
fheight
*
0
.
5
f
);
set_eparam
(
effect
,
"width_d2_i"
,
1
.
0
f
/
(
fwidth
*
0
.
5
f
));
set_eparam
(
effect
,
"width_d2_i"
,
1
.
0
f
/
(
fwidth
*
0
.
5
f
));
set_eparam
(
effect
,
"height_d2_i"
,
1
.
0
f
/
(
fheight
*
0
.
5
f
));
set_eparam
(
effect
,
"height_d2_i"
,
1
.
0
f
/
(
fheight
*
0
.
5
f
));
set_eparam
(
effect
,
"input_width"
,
fwidth
);
set_eparam
(
effect
,
"input_height"
,
(
float
)
video
->
conversion_height
);
set_eparam
(
effect
,
"input_height"
,
(
float
)
video
->
conversion_height
);
effect_settexture
(
effect
,
image
,
texture
);
effect_settexture
(
effect
,
image
,
texture
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment