Fix compiler error in browser source when shared textures are disabled #196

Merged

tbodt merged 1 commit from shared-texture-compile-error into master

2020-02-12 17:23:18 -06:00

tbodt commented

2020-02-09 00:19:17 -06:00

(Migrated from github.com)

Description

Add a missing ifdef of EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED, to make the browser source compile on non-win32 platforms where this isn't defined.

Motivation and Context

The browser source didn't compile on Mac

How Has This Been Tested?

ninja

Types of changes

Bug fix (non-breaking change which fixes an issue)

Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

My code has been run through clang-format.
I have read the contributing document.
My code is not on the master branch.
The code has been tested.
All commit messages are properly formatted and commits squashed where appropriate.

### Description Add a missing ifdef of EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED, to make the browser source compile on non-win32 platforms where this isn't defined. ### Motivation and Context The browser source didn't compile on Mac ### How Has This Been Tested? `ninja` ### Types of changes  - Bug fix (non-breaking change which fixes an issue)   - Code cleanup (non-breaking change which makes code smaller or more readable)   ### Checklist:   - [x] My code has been run through [clang-format](https://github.com/obsproject/obs-studio/blob/master/.clang-format). - [x] I have read the [**contributing** document](https://github.com/obsproject/obs-studio/blob/master/CONTRIBUTING.rst). - [x] My code is not on the master branch. - [x] The code has been tested. - [x] All commit messages are properly formatted and commits squashed where appropriate.

WizardCM commented

2020-02-09 00:49:32 -06:00

(Migrated from github.com)

I can confirm that without this change, building complains that blacklisted_devices is undefined, as that's also hidden behind experimental shared texture support.

I can confirm that without this change, building complains that `blacklisted_devices` is undefined, as that's also hidden behind experimental shared texture support.

No reviewers

No milestone

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

gh-obsproject/obs-browser!196

No description provided.

Rows
Columns